login page and ui changed a lot
Merge branch 'master' of https://github.com/hspector/bimproved

Conflicts:
	public/index.html
	public/js/controller.js