login box changes
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Generic/login/login.html
Merge branch 'master' of https://github.com/algosystech/collosys