实现学员管理
save
实现设置表演学员功能
Merge branch 'yaoyiyao'

Conflicts:
	.gitignore
实现投票接口
Merge branch 'yaoyiyao'
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'