Some cast fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	DungeonSketch/src/main/java/com/tbocek/android/combatmap/cast/CastManager.java