2013.4.28

2013.4.28修改
2013.5.2

2013.5.2
Merge remote-tracking branch 'zeng/master'