Issue #30: Implemented new unified GPS code
Merge branch 'develop' of github.com:studgent/android into develop