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

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
working on journal fragments
small optimisations
Merge remote-tracking branch 'origin/FileDownloadUnzip'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/StartScreen.java
	app/src/main/res/layout/dialog_view.xml
Merge remote-tracking branch 'origin/Nathalie'
NPE fixed Moved CreateImageURIs to Constructor :)
rf detector files added to skins
rf detector files added to skins
fixed failed progress builder poop
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'
Go home git, you're drunk.
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz' into Alex_NoTouchiePlz

Conflicts:
	.idea/misc.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/RFDetector.java
	app/src/main/res/layout/tool_rf.xml
- RF background flashes when within 25 meters of destination
- RF opens/closes according to GPS availability
- RF is done, I think
- added temporary open/close buttons to RF.
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
Merge branch '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
Fixed errors caused by locationj refactoring
-Removed RF detector debug information
-Placed proximity bar in its proper location
Beacon testr