20140803:Django模板中使用url变量
Merge branch 'dev' into gh-pages