CRMT: Tweak Map Display, Messaging: Start reworking channels
Merge branch 'master' of git://github.com/flavour/eden