changed minimum password length
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
comment out error in install3.php, converting to new color scheme
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog