Changes done in Standalone Version
Merge branch 'develop' of https://github.com/clearpath-networks/MobilitySuite into develop