Fixing 10-contents.tsv data. type and showinmenu values got transposed.
Fixing transposed data in 10-content.tsv
Merge pull request #1261 from nZEDb/next-master

Next master
Merge pull request #513 from nZEDb/dev

Dev
categorization changes
Updating format of SQL patch filenames to properly from a date (will make it easier to script creating them.
Adding isLocalDb method to DB class. Basic but can be expanded later.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
Manually updating versions.
duplicate inserts to tvrage when rageid = -2
Deleting wrongly named file.
Merge pull request #514 from nZEDb/dev

Dev
Sharing added to tmux
Fix for bad patch
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.
Fixing duplicate key constraint error, introduced by recent change to 2014-04-03 countries patch.

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
	resources/db/patches/mysql/2014-04-03_3_countries.sql
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