credits activity, delete button does something now.
possibly fixed the logo issue (on my end)
added branch?
Fixed proximity placement
Merge remote-tracking branch 'origin/BranchFlakes'

Conflicts:
	.idea/libraries/support_v13_20_0_0.xml
	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/activity_start_screen.xml
	app/src/main/res/values/strings.xml
NotWrkong
re-re-recreated branch
Stable with journal placeholder
Merge remote-tracking branch 'origin/master' into BranchFlakes
biolist
redoing file download and unzip logic, finished delete button and added it to the journal fragment.
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
added biolist layout
made biolist scrollable, BUT THE TOOLS MENU GETS ACTIVATED. WHY DANTE?
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