Changing a Fix: to Upd:
Adding proper indent.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	_build/nZEDb.xml
Moving constant definition to beginning of script to avoid error from Versions.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	_build/nZEDb.xml
Fixing runHooks to only update versions from the dev branch
fixed typo in Releases.php
moved music checks before movie checks in determineCategoryNormal as music videos were incorrectly being categorized as movies
Adding check for failed query and missing is_array call.
Updating versions file.
Merge branch 'Bart39-dev' into dev

Conflicts:
	Changelog
Merge pull request #348 from nZEDb/dev

Dev