FF 24.
Build.
Merging channels.
Build.
Merge branch 'self-hosted'

Conflicts:
	builds/disconnect.xpi
	builds/disconnect.zip
	firefox/content/overlay.js
	firefox/install.rdf