Merge branch 'master' of https://github.com/aidygee/DTSV1

Conflicts:
	app/controllers/LoginController.php