login page
Merge origin/master

Conflicts:
	LoginPage.php
mainCSS updated