Short message sprint1
sprint1
Fix some file error
Merge branch 'master' of https://github.com/alex2006/ShortMessage
Merge pull request #1 from Alex2006/develop/malong

Develop/malong