Tactical combat map, cars and basic UI being drawn
Merge remote-tracking branch 'origin/master'