20141224李雪琦和陈学飞合并后
Merge pull request #1 from duck9293/temp1

20141224李雪琦和陈学飞合并后