changes to console and overlay
fixed conflics in overlay
Merge remote-tracking branch 'jw/master'
Added unitstate
possible unit bug fix