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

Conflicts:
	application/controllers/user.php
new
import fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2