changed some colors and worked on info bar
fix conflicts
Merge branch 'c2_fresh_start' of https://github.com/azlen/collusion into azlen-c2_fresh_start