updated Changelog, reverted predb match
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog