Merge branch 'afrendy' into jono

Conflicts:
	app/controller/Login.js
	app/view/login/LogoutInfo.js
	ci/application/controllers/AuthLogin.php