Changes on the trends
Merge branch 'master' of https://github.com/annchemu/HCMP

Conflicts:
	application/controllers/rtk_management.php