初步升级到django1.7
Merge branch 'master' of github.com:lifenglifeng001/lfblog