Login
Login page last changes
Merge branch 'master' of github.com:hieurl/webint

Conflicts:
	public/login.html
Login page
Merge branch 'master' of github.com:hieurl/webint