Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into feature/User_Management
Loader+change password
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into feature/User_Management

Conflicts:
	application/models/facility_stocks.php
Change password
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
tb_report and malaria_report headers removed
19/6/2014
Consumption tabs fixed
stage 1
Merge branch 'feature/User_Management'
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2
TB and Malaria reports done
Early morning fix
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/views/subcounty/reports/program_reports_v.php
malaria,tb and rh reports modified
tb report modified
tb and malaria reports modified
final expiries
Merge with Adima
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2
Subcounty filter graphs - system usage