促销灌基本页面
temp
Merge pull request #3 from wangbailin/master

temp
Merge branch 'master' into yaoyiyao

Conflicts:
	assets/js/require.config.js
	students/front_urls.py