Merge pull request #1 from zhufree/develop

Develop
Merge branch 'master' of https://github.com/zhufree/DjangoTest

# Via Free
* 'master' of https://github.com/zhufree/DjangoTest:
Merge branch 'master' into develop