20140616：Django初探之部署与静态文件配置
Merge branch 'dev' into gh-pages