Merge pull request #1303 from nZEDb/next-master

Read the Changelog
Manually fixing versions.
Manually updating versions.
Manually updating versions.
Manually updating versions again!!
Manually updating versions (for the last time).
Merge branch 'master' into dev
Removing patch that shouldn't have made it into dev yet ;-)
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Manually updating versions.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Fixing typo in Changelog.