Dante fixed everyting
Dante fixed everyting
changed url
changed root var
Updated apks
Merge branch 'FileDownloadUnzip'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
How do you like dem scrollviews
added xml
changed internetDialog message
- Made gcLocation extend Location
- Made GPS update frequency proportional to distance from target
- Implemented proximity progress bar
Massive Zip file bug
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Amplifier.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Communicator.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Imager.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Journal.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/LocationMap.java
NPE fixed Moved CreateImageURIs to Constructor :)
Merge remote-tracking branch 'origin/FileDownloadUnzip'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz'

Conflicts:
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/RFDetector.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/experience/gcLocation.java
NPE fixed Moved CreateImageURIs to Constructor :)
Merge remote-tracking branch 'origin/master' into Nathalie
Signal Beacon Custom View