diff --git a/drivers/firefox/locale/de-DE/wappalyzer.dtd b/drivers/firefox/locale/de-DE/wappalyzer.dtd
new file mode 100755
index 000000000..96e1715cf
--- /dev/null
+++ b/drivers/firefox/locale/de-DE/wappalyzer.dtd
@@ -0,0 +1,47 @@
+<!ENTITY wappalyzer.name        "Wappalyzer">
+<!ENTITY wappalyzer.help        "Wappalyzer - klicken für Details und Einstellungen">
+
+<!ENTITY wappalyzer.showIcons   "Applikations-Icons zeigen">
+<!ENTITY wappalyzer.preferences "Weitere Optionen ...">
+<!ENTITY wappalyzer.addonBar    "In Addon-Leiste platzieren">
+<!ENTITY wappalyzer.categories  "Kategorienverwaltung">
+<!ENTITY wappalyzer.tracking    "Tracken">
+<!ENTITY wappalyzer.research    "Anonymously send reports on detected applications to wappalyzer.com for research">
+<!ENTITY wappalyzer.research    "Sende anonyme Reports über gefundene Applikationen zu Forschungszwecken an wappalyzer.com">
+
+<!ENTITY wappalyzer.donate      "Spenden!">
+<!ENTITY wappalyzer.feedback    "Feedback">
+<!ENTITY wappalyzer.github      "Github">
+<!ENTITY wappalyzer.twitter     "Twitter">
+<!ENTITY wappalyzer.gplus       "Google Plus">
+<!ENTITY wappalyzer.website     "Zu wappalyzer.com browsen">
+
+<!ENTITY wappalyzer.cat1        "CMS">
+<!ENTITY wappalyzer.cat2        "Webforen">
+<!ENTITY wappalyzer.cat3        "Datenbankverwaltung">
+<!ENTITY wappalyzer.cat4        "Dokumentationstools">
+<!ENTITY wappalyzer.cat5        "Widgets">
+<!ENTITY wappalyzer.cat6        "Webshops">
+<!ENTITY wappalyzer.cat7        "Bildergalerien">
+<!ENTITY wappalyzer.cat8        "Wikis">
+<!ENTITY wappalyzer.cat9        "Hosting Panels">
+<!ENTITY wappalyzer.cat10       "Analyse">
+<!ENTITY wappalyzer.cat11       "Blogs">
+<!ENTITY wappalyzer.cat12       "JavaScript-Bibliotheken">
+<!ENTITY wappalyzer.cat13       "Bugtracking-Systeme">
+<!ENTITY wappalyzer.cat14       "Videoplattformen">
+<!ENTITY wappalyzer.cat15       "Kommentarsysteme">
+<!ENTITY wappalyzer.cat16       "CAPTCHAs">
+<!ENTITY wappalyzer.cat17       "Font-Skripte">
+<!ENTITY wappalyzer.cat18       "Web-Frameworks">
+<!ENTITY wappalyzer.cat19       "Vermischtes">
+<!ENTITY wappalyzer.cat20       "Editoren">
+<!ENTITY wappalyzer.cat21       "LMS">
+<!ENTITY wappalyzer.cat22       "Webserver">
+<!ENTITY wappalyzer.cat23       "Cachetools">
+<!ENTITY wappalyzer.cat24       "Rich-Text-Editoren">
+<!ENTITY wappalyzer.cat25       "Javascript Graphics">
+<!ENTITY wappalyzer.cat26       "Mobile Frameworks">
+<!ENTITY wappalyzer.cat27       "Programmiersprachen">
+<!ENTITY wappalyzer.cat28       "Betriebssysteme">
+<!ENTITY wappalyzer.cat29       "Suchmaschinen">
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.properties b/drivers/firefox/locale/de-DE/wappalyzer.properties
new file mode 100755
index 000000000..bd25e4c9f
--- /dev/null
+++ b/drivers/firefox/locale/de-DE/wappalyzer.properties
@@ -0,0 +1,2 @@
+wappalyzer.name           = Wappalyzer
+wappalyzer.noAppsDetected = Keine Applikationen erkannt
diff --git a/share/images/icons/Apache OFBiz.ico b/share/images/icons/Apache OFBiz.ico
new file mode 100644
index 000000000..f0c22ad9b
Binary files /dev/null and b/share/images/icons/Apache OFBiz.ico differ
diff --git a/share/images/icons/Bigware.ico b/share/images/icons/Bigware.ico
new file mode 100644
index 000000000..12470c049
Binary files /dev/null and b/share/images/icons/Bigware.ico differ
diff --git a/share/images/icons/Endeca.ico b/share/images/icons/Endeca.ico
new file mode 100644
index 000000000..43d0081b1
Binary files /dev/null and b/share/images/icons/Endeca.ico differ
diff --git a/share/images/icons/FAST ESP.ico b/share/images/icons/FAST ESP.ico
new file mode 100644
index 000000000..9de046a1e
Binary files /dev/null and b/share/images/icons/FAST ESP.ico differ
diff --git a/share/images/icons/FAST Search for SharePoint.ico b/share/images/icons/FAST Search for SharePoint.ico
new file mode 100644
index 000000000..77e829225
Binary files /dev/null and b/share/images/icons/FAST Search for SharePoint.ico differ
diff --git a/share/images/icons/Solr.ico b/share/images/icons/Solr.ico
new file mode 100644
index 000000000..eded10aac
Binary files /dev/null and b/share/images/icons/Solr.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index 0d1306555..1fe81bed9 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -55,6 +55,7 @@
 		'Backbone.js':           { cats: { 1: 12 }, script: /backbone.*\.js/, env: /^Backbone$/ },
 		'BIGACE':                { cats: { 1:  1 }, meta: { 'generator': /BIGACE/ }, html: /Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE/i },
 		'BigDump':               { cats: { 1:  3 }, html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
+		'Bigware':               { cats: { 1:  6 }, html: /bigware/i },
 		'blip.tv':               { cats: { 1: 14 }, html: /<(param|embed)[^>]+blip\.tv\/play/i },
 		'Blogger':               { cats: { 1: 11 }, meta: { 'generator': /blogger/i }, url: /^(www.)?.+\.blogspot\.com/i },
 		'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
@@ -75,7 +76,7 @@
 		'CodeIgniter':           { cats: { 1: 18 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker|ci_session)/ } },
 		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/, env: /^_?COMSCORE$/i },
 		'Concrete5':             { cats: { 1:  1 }, meta: { 'generator': /concrete5/i } },
-		'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
+		'Contao':                { cats: { 1: 1, 2: 6 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
 		'Contens':               { cats: { 1:  1 }, meta: { 'generator': /contens/i } },
 		'ConversionLab':         { cats: { 1: 10 }, script: /conversionlab\.trackset\.com\/track\/tsend\.js/ },
 		'Coppermine':            { cats: { 1:  7 }, html: /<!--Coppermine Photo Gallery/i },
@@ -111,6 +112,8 @@
 		'ExtJS':                 { cats: { 1: 12 }, script: /ext\-base\.js/, env: /^Ext$/ },
 		'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker)/ } },
 		'eZ Publish':            { cats: { 1:  1 }, meta: { 'generator': /eZ Publish/i } },
+		'FAST Search for SharePoint': {cats: {1: 29}, url: /Pages\/SearchResults\.aspx\?k\=/ },  
+		'FAST ESP':              { cats: { 1: 29 }, html: /fastsearch|searchProfile\=|searchCategory\=/i, url: /esppublished|searchProfile\=|searchCategory\=/i },
 		'Fact Finder':           { cats: { 1: 29 }, html: /fact-finder|\/images\/fact-finder\.gif|ViewParametricSearch|factfinder|Suggest\.ff|FFSuggest/i, url: /ViewParametricSearch|factfinder|ffsuggest/i },
 		'FluxBB':                { cats: { 1:  2 }, html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
 		'Flyspray':              { cats: { 1: 13 }, html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },