20140608MySQL的安装添加django网页中文乱码问题解决方法
Merge branch 'dev' into gh-pages