Changed login
Merge branch 'change'
Merge branch 'master' of https://github.com/hspector/bimproved

Conflicts:
	public/js/controller.js
	public/stylesheet.css