Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	css/style.css
	src/Images/ImageExpand.coffee
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
Try to fix thread updater.
Fix Gallery "fit height" in Chrom*
Place remove spoilers after Linkify
Trick thread updater into allowing 1 second
PROTIP: minimum seconds are now techically two, but it'll still
display one. Anyone pissed about this needs to get a life.
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
Release 4chan X v3.11.4.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190
Just in case
Add /con/ support
Merge pull request #1286 from Proplex/new-branch3

Add /con/ support
Update deps.
{Post,Thread}::callbacks => {Post,Thread}.callbacks
Add `QRPostSuccessful_`. #1127
Changelog.
Release 4chan X v3.11.5.
Update archives.json.
Merge pull request #1288 from ihavenoface/v3

Update archives.json.