Complete Re-Do

Complete Re-Do, fixing Android GPS permissions.