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

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
working on journal fragments
Signal Beacon View
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 :)
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