Merge branch 'master' into space/standardized

Conflicts:
  space/index.shtml > 加上 RJ 新增的兩句