Many updates
Merge branch 'master' of github.com:d2emon/mywiki