Merge branch 'master' of https://github.com/MissionBit/SnailAssalt

Conflicts:
	core/src/com/missionbit/snailassalt/SnailAssalt.java