From 8cc211c7f611257dfcfba93200a3ee85aff4c9c6 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sat, 25 Oct 2014 16:35:55 +1100
Subject: [PATCH] Manually merged Advert Stream, Airee, fixed Craft CMS icon

---
 share/apps.json                  |  21 +++++++++++++--------
 share/images/icons/craft_cms.png | Bin 1803 -> 0 bytes
 2 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 share/images/icons/craft_cms.png

diff --git a/share/apps.json b/share/apps.json
index 4a3e79299..2acd7cb62 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -152,12 +152,23 @@
 			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"implies": "Java"
 		},
+		"Advert Stream": {
+			"website": "www.advertstream.com",
+			"cats": [ 36 ],
+			"env": "^advst_is_above_the_fold$",
+			"script": "(?:ad\\.advertstream\\.com|adxcore\\.com)"
+		},
 		"Adzerk": {
 			"website": "adzerk.com",
 			"cats": [ 36 ],
 			"env": "^ados(?:Results)?$",
 			"script": "adzerk\\.net/ados\\.js",
-			"html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net",
+			"html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net"
+		},
+		"Airee": {
+			"website": "xn--80aqc2a.xn--p1ai",
+			"cats": [ 31 ],
+			"headers": { "Server": "Airee" }
 		},
 		"Akamai": {
 			"website": "akamai.com",
@@ -3597,16 +3608,10 @@
 			"website": "wordpress.org",
 			"cats": [ 1, 11 ],
 			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
-			"html": "<link rel=[\"']stylesheet[\"'] [^>]+wp-(?:content|includes)",
+			"html": [ "<link rel=[\"']stylesheet[\"'] [^>]+wp-(?:content|includes)", "<link[^>]+s\\d+\\.wp\\.com" ],
 			"env": "^wp_username$",
 			"implies": "PHP"
 		},
-		"WordPress.Com": {
-			"website": "wordpress.com",
-			"cats": [ 1, 11 ],
-			"html": "<link[^>]+s\\d+\\.wp\\.com",
-			"implies": "WordPress"
-		},
 		"WordPress Super Cache": {
 			"website": "ocaoimh.ie/wp-super-cache/",
 			"cats": [ 23 ],
diff --git a/share/images/icons/craft_cms.png b/share/images/icons/craft_cms.png
deleted file mode 100644
index 115d73f9cd84448108f4c1d25c073904eb670563..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1803
zcmaJ?dpJ~S96oM~iK0?MI;N;>a~~5U*BLT2E@KL*-NwveCT7lD4yGDUQf;KHkZMaF
zYqQ(tlD3PsM3$~1C6!CmN+C;#HB@^>(f+aaJm;M6`+m>+zQ5~vPD-HvT4Rg_1^@tK
zmJgGIuAt^I&_>@A=6(6-vIy}CMS|f-B%UXS01p8i0f8(rFACy7Ji#{EZD<Vu=qwX)
zLy=JSIyxT~<9QkkUMZHMYyeo}rj+vd(GUVgKv5!z3%37C1r`(uT(BVyY$99AfP^BS
z?Q$r1yFZt|J(}+%z`D7DYm{_UKnx)~P$`a)DCkNT?4&Lo-D}JQEI0{4qFu0`f(m5^
zf(%#=fev^Ij!z_!KpG8CqB_uMq*Wl9NFo!6=uN|ssB{M!oxB?Sd|^><azP}W!}R{_
z3q84Dg$N?06A1C~@%VTO9+pQDNKQ^p8VxcThazx_Z4!j1#7PuOrxciwf-e_I5fLl_
zHHy3lI2LiiqLF?|K`fn?l_)-!2`v~w$&(UDc%mkyDIlBu|4^}b8m&M$(3g1sQ&_>>
zCWQzbNCC&n`Do)Jmug%|=?po<Ltr@<hGV9x7$}4hSRsU^AS0Ltu3+={B8kSZa+1Mj
z(^(P)!jteJ7SjcbYT!j80o}oqL?u!jDI^BNiA3_EdU!cHGO6A)ilc`ol|f`oahWhb
zRt!myDX!oPmpUU?GYn!W>X`}2MRAb8TMmoC$)xF`nPVZ%sP~yGm^l{mj9da53_;V{
zf3<qbgwBs<J3YAQVS4l-2|Dj`bg(U;v^Mm6NnkNOxXR|jY}h9_XntjXLQ6}_vjU22
z$PLP7g%!-Vu&{maFupc0$YZ!>&LT|0{<E&bD-DvCRWX^qwL(2TQG?qb>->U)^VZwH
z+_!4=tAg?I))C2Qxl3*xf>-H}Tx^T4A8S+8UmmqeHqm~b(%vl{RY@(!kLK#QJ~Zf!
z(=N2n%q&ge4*I@S$Gq!O9kYu_TVSMLX_RnWNOq)$?`psMwMXKGfq8x%`cb+Op#qP*
zxQ{Z<!iD%s=SYi^5_#O!9PvWS*$+&4TB#U&b!cf^|MMEHw5E`*W=yB-ZNX*Rq)Ne6
zoLV=mlf34|ZyQww?ZDZjc~w^CrR6>$D(m{g_0bl=xOeL_>zDWwPCT>~Ua;GF$u7$B
z@b6#UVadq7vMb|P-rxwE+WNJUPNZT^+4KKQvId*r;;UW4ojCPumVHkLOZ?o_^EAfn
z*Xtz(J-zARFm%N1Eo+wcKtan7My;+xO{cSvw#%ve%c`a1gE<icnSp^XZnfghRqPP$
zh&1^zIi2nt5VFxV+~)j*GsU38;rp~l8wQ-~igM~|YwA2Rbp1@QN`)kUWx$p(LCm>p
z=T#|9yMfxohNn-fZf1p7e0a0>zRi0$v8W-Dt?yZUyPZ+wtItUW23nS%*j%LAC@Xzr
zP1jmBSF59EEO{u`Po<kBvaDW}ZPYO~80OduG=w?1(@h^_EwY|FqVI0+u-P-QW7lIU
zcJ?8)vRf-r7SP@gJlNW;CG47I^TG9yxqG1RF2H7Ig`aWy&1$_m;*p@;-rZV_`_EUF
zA2ciu5I@k727unzDfjCq%+t-?qu^bh=4Hh29(&WfzJ}=yJ;_N}S>sT7z4~?WPp<%A
zQ>@|PjfI03Z^kw)H|A(}Hve*z0=*DbE;*AIIef#cq{gbbx-s|Lg7A>VefNg0<%AF8
zMx*Uc(rOWpvcJ>0%xC`hnl^LqY;`=-skSS$<`e$P*;KyRr1Xh@XPQpK&%Oq}rkKQ!
zY3*lDszv~t=dJgs`^Xsw0x}vbI)~IT3qF<|BP0NZkBN`dYqGzoTHN!Z{B(Zby(c-x
z3m>|sS`Dy>W{s-{3EW<qS1vv;BYR)VgnGHy@zzL}_n!Xi-8bg@KW<!Pz6Xg+i)#;h
z)LeTuf_UkW+-Y-LUl~R4oql=#(pz_>=BF|mZC7M)ULS~oHsI^hOcs2=5P@{Py^96s
S=GbX|Pb@EgX0hj%q<;XsCDWDw