view bugs fix and layout tweaking
Initial commit. Making GPS update interval dependant on distance from target
Skinning
Should work, proximity not implimented yet, ready for merge
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
Updated apks
Merge branch 'FileDownloadUnzip'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Skinning error with bitmaps, send help