添加白名单
Merge branch 'master' of github.com:zcbhaha/yanfenghupo

Conflicts:
	main/views.pyc
添加管理界面
Merge branch 'master' of github.com:zcbhaha/yanfenghupo

Conflicts:
	main/views.pyc