fixed units
moved unit and marine into unit package, create gameunit class to contain all units present in the game
Merge https://github.com/omsmith/rts_server

Conflicts:
	src/server_battle/UnitCreationOrder.java
Owen's commit

Going to figure out what this means for all the related systems
tomorrow. Lots of re-codeing ahead