Online Offline declaration made. Dont upload until after i demonstrate
no message
New for dashboard
Report
log report & update order changes
New dashboard
Merge branch 'master' of https://github.com/HCMPKenya/HCMP into develop
Merge branch 'master' of https://github.com/karsanrichard/HCMP-1 into develop

Conflicts:
	application/views/national/national_home_v.php
	application/views/rtk/rtk/admin/admin_messages.php
	application/views/rtk/rtk/admin/admin_messages1.php
	application/views/shared_files/template/template.php
offline indicator
New dashboard
Merge branch 'master' of https://github.com/HCMPKenya/HCMP into develop

Conflicts:
	application/views/rtk/rtk/admin/admin_messages.php
Merge branch 'develop' of https://github.com/Mureithi/HCMP-1
password reset