About to cluster hard
Merge remote-tracking branch 'origin/Cahue' into Cahue

Conflicts:
	app/src/main/java/com/bahpps/cahue/spots/SpotsDelegate.java