regex additions / code cleanup
using theirs
using theirs
help me
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev

Conflicts:
	_build/nZEDb.xml
regex additions / fixing merge conflicts