fix conversion bug and->or
Merge branch 'master' of toolserver:git/wmajs
add tunnel and bridge stuff
work on rendering styles
work on style sheet