bootstrap less overrides organize
css changes
Merge branch 'master' into develop

Conflicts:
	assets/styles/login.css
	views/login/index.ejs