Missing file
Merge remote-tracking branch 'origin/master' into Alex_NoTouchiePlz

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Map stuff is almost done:

- Left button is broken, need help (Dante)
- Right button only increased seletctedLocation up to 13, need help (Dante)