Revert "housekeeping, removed unused imports, commented out future functionality"

This reverts commit 2c16b0b1c72a4751b19d3f71f87e84ef0a7e6d5a.
Merge branch 'master' of github.com:timschambers/mapcrunch_android