//TODO: write a commit message
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/Tools.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/views/LightButton.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/views/LightHolder.java
Updated to new map banner. Made it animate :D
fixed file naming error
Implimented onInfoWindowClick
Added vibration, but it's buggy =/
removed apks from tracking
Debug Menu.
Mostly Stable Demo with Imager.
Mostly Stable Demo with Imager.
Alex Merge
Merge remote-tracking branch 'origin/master' into Alex_NoTouchiePlz

Conflicts:
	.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
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/ExperienceManager.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/MainActivity.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/experience/gcParser.java
Merge remote-tracking branch 'origin/master' into Alex_NoTouchiePlz

Conflicts:
	.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
//TODO: write a witty message
Missing file
Merge remote-tracking branch 'origin/master' into Alex_NoTouchiePlz

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Map stuff is almost done:

- Left button is broken, need help (Dante)
- Right button only increased seletctedLocation up to 13, need help (Dante)
Missing file
updated locations:

-fixed coords
-fixed some IDs
-removed a few redundancies
undid changes to location

There's a disparity between Google Earth's output, and how the pins are shown on the map