Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live

Conflicts:
	application/controllers/user.php