Fixing trailing white-space from bad commit!
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/controllers/Binaries.php
	nzedb/controllers/CollectionsCleaning.php
Fixing regexes to allow Windows' file paths to work.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Updating Changelog.