login bar align right
Merge remote-tracking branch 'origin/master'

Conflicts:
	parse/public/index.html
	parse/public/main.css