updated pages
Merge branch 'master' of http://github.com/digitalspider/jspwiki
changes