Merge branch 'master' into gitcafe-pages

* master:
  change google api
  update about
test auto layout
test
<meta name=viewport content="width=device-width, initial-scale=1">
123
change templates
update
test
insert baidutongji
fix bug
update~
update
refresh site
tongji baidu
baidu tongji
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  baidu tongji
  tongji baidu
  refresh site
  update
  update~
  fix bug
  insert baidutongji
  test
  update
  change templates
  123
  <meta name=viewport content="width=device-width, initial-scale=1">
  test
  test auto layout
test