Oh dear, yet another missed namespace.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Manually updating versions.
Numerous fixes and changes
Merge pull request #134 from nZEDb/dev

Dev