changes
change
National dashboard
Merge branch 'master' of https://github.com/KevinMarete/NASCOP
Conflicts:
application/controllers/dashboard_management.php
	application/controllers/national_management.php
	application/controllers/system_management.php
	application/models/patient_scaleup.php
	application/views/admin/add_param_a.php
	application/views/dashboard/pharmacist.php
	application/views/home_v.php
	assets/js/Merged_JS.js
	assets/js/jquery.form.js
national dashboard graphs
national dashboard charts