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

Conflicts:
	application/views/template.php
Merge branch 'master' of https://github.com/RiscaJack/HCMP

Conflicts:
	application/views/template.php
Merge
Merge branch
template