added UnitTypes to Unit and fixed it in GameController
merge