Fixed proximity placement
I think RF is done:
- Fixed a few bugs with the lid
- Lid is now in the URI system
- Switches to the communicator once you arrive at the destination, and calls the out-of-app-experience.

I still think we need an "X marks the spot" marker, just to be clear.
Stable with journal placeholder
Fixed the journal frame bug.
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Stable with journal placeholder