2013-07-27更新站点
2013-07-27更新站点
Merge remote-tracking branch 'origin/beta1.0' into beta1.0