forgot to modify nginx/mosky.tw.tmpl
Merge branch 'master' into dev