last import cleanup before merge
Merge branch 'not-sophia' of github.com:timschambers/mapcrunch_android into not-sophia