Merge origin/master

Conflicts:
	views/scripts/login.php
Merge origin/master
Merge origin/master
Merge origin/master