pull
Merge branch 'dev' of github.com:loggerhead/wutong into dev
html wrap to template