Merge branch 'hotfix/2.0.4'
made admin sidebar server side

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
corrections at device registration request

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

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

Since I removed tests data that was hanging

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'feature/serverside_processing' into hotfix/2.0.6
Merge branch 'feature/data_corrections' into hotfix/2.0.6
Merge branch 'hotfix/2.0.6' into develop
Merge remote-tracking branch 'bakasa/develop' into develop
Merge remote-tracking branch 'bakasa/develop' into develop
db
Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into develop
made nacp equipment serverside

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

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
user
Merge remote-tracking branch 'upstream/feature/serverside_processing' into develop
test side-bar