flashingggggg :D
Merge remote-tracking branch 'origin/master' into Alex_NoTouchiePlz

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/RFDetector.java
Organized stuff :D

Fixed the tangled tree of if statements. Yay :D
Fixed stuff.
Merge remote-tracking branch 'origin/Alex_NoTouchiePlz' into Alex_NoTouchiePlz

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Credits.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/ProximityTest.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/StartScreen.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/LocationMap.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/RFDetector.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Tester.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/ToolFragment.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Tools.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/gcLocationManager.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/gcMediaService.java
optimised removeExtension
fixes and stuff
Merge in.