new changes
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/models/users.php fixed
merge fix
report fix
fixed
order fixes
This are changes that were made by Jack