asd
asd
asd
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	application/controllers/IdentityController.php
	application/views/scripts/identity/login.phtml
sd