Working sequential turn system: Planning > P1 move > AI move > p1 combat > AI Combat
Merge branch 'develop' of https://github.com/warreq/Scamp into develop

Conflicts:
	core/src/com/warsheep/scamp/processors/ControlProcessor.java
	core/src/com/warsheep/scamp/processors/StateProcessor.java
	core/src/com/warsheep/scamp/screens/MainGameScreen.java
Minor changes to previous commit (merge bugs)