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

Conflicts:
	application/views/shared_files/template/template.php
	assets/css/style.css q
New