Changed android location to Google Play Services Location. Refactored code. Minor fixes.