delete #

delete #
Merge pull request #1 from diandian2014/develop

delete #