Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into develop
user
Merge remote-tracking branch 'upstream/feature/serverside_processing' into develop
Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into develop
Incomplete procedures
Incomplete Procedures
Procedure
corrections on tests_line_trend procedure

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Procedures
error procedures not complete

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge remote-tracking branch 'shohiek/feature/db_procedures' into feature/concurrent_charts
test side-bar
get_error_details procedure

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Procedures Complete
Merge remote-tracking branch 'shohiek/feature/db_procedures' into feature/concurrent_charts
ss
Merge branch 'feature/serverside_processing' into feature/concurrent_charts

Conflicts:
	application/modules/admin/controllers/users.php
Merge remote-tracking branch 'bakasa/develop' into feature/concurrent_charts
restructuring of errors page (in progress)

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
completed restructuring errors page.

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>