Recovering
Merge branch 'recovered_stuff'

Conflicts:
	.gitignore
	.idea/gradle.xml
	.idea/libraries/geohash_1_0_10.xml
	.idea/misc.xml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	build.gradle