Demo almost ready to be tested
Demo1 is nearly ready!
Merge remote-tracking branch 'origin/master' into Dev
camera speed update
Fixed UnitImpoter
Merge remote-tracking branch 'origin/Alex'
bad
Merge branch 'master' of https://github.com/kawake/WarGame

Conflicts:
	UnitStatV1.csv
	src/Importer/UnitImporter.java
Merge remote-tracking branch 'origin/Alex'
cvs error fix