updated structures and units
added taking damage to units
Merge branch 'master' into GameLogic