Updating Docblock for $log property
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Fixing stuff overwritten by someone's merge and cleaning up old method signatures.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/controllers/Binaries.php
Updating Changelog.