Deleting wrongly named file.
Fixing duplicate key constraint error, introduced by recent change to 2014-04-03 countries patch.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Manually updating versions.
Fix for non alpha themes send to sab.
Merge branch 'dev' of https://github.com/DariusIII/nZEDb into DariusIII-dev

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
Fix: Contents page. Fix: Mix of single/double quotations in 10-menu.tsv making queue/newposterwall not visible on new installs.
Remove var dump.
Add: New content page to other themes. Add: Link to more content from index.
Cleaning data files to remove unneeded quoting.
Merge branch 'dev' into dev-db

Conflicts:
	resources/db/schema/data/10-menu.tsv
Updating Chamgelog.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev

Conflicts:
	Changelog
merge Darius III pr for tmux sharing
fix patch file name
for real this time
Rework removecrap blacklists to two functions instead of one
Merge pull request #515 from nZEDb/dev

Dev