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

Conflicts:
	application/controllers/user.php
no message
Merge branch 'master' of https://github.com/annchemu/HCMPv2
new
Latest Changes, Facility Profile, Edit Facilities
Merge branch 'master' of https://github.com/annchemu/HCMPv2

Conflicts:
	application/controllers/rtk_management.php
	application/views/rtk/rtk/lab_commodities_v.php
import fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
images
switching districts issue

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

Conflicts:
	application/views/rtk/rtk/dpp/dpp_home_with_table.php
Facility amc compute changes
Changes in the F-CDRR form.
1. Add form: removing comments
2. Edit form: validation and calculating functions
Merge branch 'master' of https://github.com/annchemu/HCMPv2