Merge pull request #1 from dupengtao/dev

merge dev
add assets