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

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz' into Alex_NoTouchiePlz

Conflicts:
	.idea/libraries/support_v4_19_1_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/app.iml
added rf_lid to the URI system
-Removed RF detector debug information
-Placed proximity bar in its proper location
Beacon testr
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'

Conflicts:
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
BeaconWorking