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

Conflicts:
	system/libraries/Hcmp_functions.php

server404