Login.
Merge branch 'tim'

Conflicts:
	application/controllers/login.php
select tim's branch.