update account and usermanage, login
sua conflig file logincontroller

Merge branch 'master' of https://github.com/hoangdd/7maru

Conflicts:
	app/Controller/LoginController.php