view bugs fix and layout tweaking
Notes to self
removed stupid log msg
commented out stuff that caused OOM exception
Apk added
Merge remote-tracking branch 'origin/FileDownloadUnzip'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/ToolFragment.java
	app/src/main/res/layout/activity_main.xml
Skinning
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Journal.java
Merge with nat
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'

Conflicts:
	ARView/ARView.iml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/res/layout/activity_start_screen.xml
Merged with alex.
RemoteTest
Included Experience files
Included Experience files
Included Experience files
Included Experience files
Included Experience files
Included Experience files
Included Experience files