base
js
js
滑动效果
temp
Merge branch 'master' of github.com:wangbailin/china-v into wangbailin-master

Conflicts:
	assets/js/require.config.js
	base/urls.py
merge
Merge branch 'wangbailin-master'
Merge pull request #1 from wangbailin/master

促销罐投票功能页面
base
js
js
temp
Merge pull request #2 from wangbailin/master

merge
Merge branch 'master' into yaoyiyao

Conflicts:
	assets/js/require.config.js
	base/urls.py
fix deps