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

Conflicts:
	application/config/database.php
 f