Merge branch 'master' of github.com:kewgen/regolith

Conflicts:
	client/src/com/geargames/regolith/serializers/answers/ClientMoveWarriorAnswer.java