Grrrrr, another namespace problem
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Merge pull request #152 from nZEDb/dev

Dev