fixed colors
Merge branch 'master' of ssh://131.172.181.22:6022/cja/gitbare/etc
various