Que
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Update version file.
Merge pull request #687 from nZEDb/dev

Dev