Merge remote-tracking branch 'origin/master' into gh-pages
test
edit layout and add chinese language, add 320px resolution
Merge branch 'gh-pages'