//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 =/
Alex Merge