20141224:Django之单元测试
Merge branch 'dev' into gh-pages