Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into develop
user
Merge remote-tracking branch 'upstream/feature/serverside_processing' into develop
test side-bar
Procedures Complete
Merge remote-tracking branch 'shohiek/feature/db_procedures' into feature/concurrent_charts
Merge branch 'feature/serverside_processing' into feature/concurrent_charts

Conflicts:
	application/modules/admin/controllers/users.php