Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html

src/General/html/Settings/Advanced.html

@@ -83,7 +83,6 @@
 
 <fieldset>
   <legend>Unread Favicon <span class=warning #{if Conf['Unread Favicon'] then 'hidden' else ''}>is disabled.</span></legend>
-  <div>
   <select name=favicon>
     <option value=ferongr>ferongr</option>
     <option value=xat->xat-</option>
@@ -92,9 +91,18 @@
     <option value=Original>Original</option>
   </select>
   <span id=favicon-preview></span>
-  </div>
 </fieldset>
 
+<fieldset>
+  <legend>Emoji <span class=warning #{if Conf['Emoji'] then 'hidden' else ''}>is disabled.</span></legend>
+  <div>
+    Sage Icon: <select name=sageEmoji>
+      <option value="4chan SS">4chan SS</option>
+      <option value="appchan">appchan</option>
+    </select>
+    <span class=sage-icon-preview></span>
+  </div>
+
 <fieldset>
   <legend>Thread Updater <span class=warning #{if Conf['Thread Updater'] then 'hidden' else ''}>is disabled.</span></legend>
   <div>

src/Monitoring/Favicon.coffee

@@ -1,6 +1,5 @@
 Favicon =
   init: ->
-    $.ready ->
     Favicon.el      = $ 'link[rel="shortcut icon"]', d.head
     Favicon.el.type = 'image/x-icon'
     {href}          = Favicon.el