Merge branch 'hotfix/2.0.1' into develop
bug fixes

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
admin devices wrong count

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge remote-tracking branch 'origin/develop' into feature/data_corrections
correct poc equipment count

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'develop' into hotfix/2.0.2
Merge branch 'feature/data_corrections' into hotfix/2.0.2
Merge branch 'hotfix/2.0.2'