Reports Changes
Merge branch 'master' of https://github.com/ttunduny/HCMP-1

Conflicts:
	application/controllers/rtk_management.php