switching districts issue

switching districts issue fixed
Merge branch 'master' of https://github.com/CodeKlerk/HCMPv2

Conflicts:
	application/views/rtk/rtk/dpp/dpp_home_with_table.php
Facility amc compute changes
Merge branch 'master' of https://github.com/ttunduny/HCMPv2
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2