Merging branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/reports.php