work on styles
Merge branch 'master' of toolserver:git/wmajs