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

Conflicts:
	.htaccess
	application/controllers/user.php
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
12
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live

Conflicts:
	.htaccess
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
121
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
1478222
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live

Conflicts:
	application/controllers/user.php
1211
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
wwww
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2_live