Large untested coding update
Updates
Merge branch 'master' of https://github.com/lancecraner/roadrunner.git

Conflicts:
	.classpath
	bin/CromwellMarstonMoor.apk
	bin/classes.dex
	src/com/craner/cromwellmarstonmoor/Combat.java
	src/com/craner/cromwellmarstonmoor/Terrain.java
	src/com/craner/cromwellmarstonmoor/Unit.java