Merge origin/master

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

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

Conflicts:
	application/views/login.php