Initial map adapter
Moved account stuff
Move to JSON reader
Merge branch 'master' of https://github.com/marlin-gingerich/kluster-android