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

Conflicts:
	application/controllers/evaluation.php
	application/models/evaluation_data.php