Merge origin/master

Conflicts:
	controller/login.php
Merge origin/master
Merge origin/master

Conflicts:
	controller/login.php
Merge origin/master

Conflicts:
	controller/login.php