Added helper methods, and some code refactoring to facilitate current environment detection.
Basic environment detection working! :)
Minor change - Disconnect location client when GeoFences addition is done