Replaced LocationManager.getLastKnownLocation() with
LocationServices.FusedLocationApi.getLastLocation()
Done some code cleanup
Solved location api merge conflicts
Merge branch 'splashLocation'