fixed password min length patter attribut
dashboard badge edit
Merge branch 'nathan-dev' into aaron-dev

Conflicts:
	app/less/app.less