Integrated graph
your htacess may differ
admin user
Merge branch 'master' of https://github.com/karsanrichard/HCMP-1

Conflicts:
	.htaccess
	application/controllers/national.php
Order Dashboard
Merge branch 'master' of https://github.com/Mureithi/HCMP-1