.
Merge branch 'master' of github.com:tevyt/CheapoMail
Modification to login
Merge branch 'master' of github.com:tevyt/CheapoMail

Conflicts:
	loginscreen.php