2012-8-16 实体更新
Merge remote-tracking branch 'origin/master'