Merge origin/master

Conflicts:
	application/controllers/login.php
Merge origin/master