Merge branch '1.8.10.x' into 1.9.0.x

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json

CHANGELOG.md

@@ -21,6 +21,18 @@ Based on v1.8.10.4.
 - Fix QR cooldown storage overflow bug.
 - Remove buggy `Cooldown Prediction` feature.
 
+### v1.8.10.6 
+*2014-08-25*
+
+**ccd0**
+- Fix code that could insert path to Greasemonkey script into the page.
+
+### v1.8.10.5 
+*2014-08-24*
+
+**ccd0**
+- Fix header hiding bug (backported from v1.9.0.1).
+
 ### v1.8.10.4 
 *2014-08-22*
 

src/General/Main.coffee

@@ -252,7 +252,7 @@ Main =
     message = $.el 'div',
       textContent: data.message
     error = $.el 'div',
-      textContent: data.error
+      textContent: "#{data.error.name or 'Error'}: #{data.error.message or 'see console for details'}"
     [message, error]
 
   isThisPageLegit: ->