Fixed proximity placement
Greenie bluetooth work
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
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	.idea/libraries/play_services_5_0_77.xml
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Three bluetooth graphs initial
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	.idea/libraries/support_v13_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Start off for amplifier sounds
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Tester.java
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Unworking-MidRefactor.
Unworking-MidRefactor.
Amplifier sounds sort of working.
SignalBeacon class created and code made prettier
Pre-Demo, Minor bugs.
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/AndroidManifest.xml
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/JournalFragment/BioList.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/JournalFragment/Settings.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/StartScreen.java
Demo+merge