Tagging dev as v0.3.5-dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Manually updating versions.