20140611：Django部署至Apache
Merge branch 'dev' of github.com:fl0wjacky/jekyll_demo into dev
Merge branch 'dev' into gh-pages