Clean up code
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/codebattle/model/GameActor.java
	core/src/com/codebattle/utility/GameUnits.java