搭建摇一摇页面框架
实现投票统计
refine vote
Merge pull request #2 from wangbailin/master

merge
实现摇一摇首页样式
实现活动说明功能
Merge branch 'master' into yaoyiyao

Conflicts:
	assets/js/require.config.js
	base/urls.py
fix deps
speed up animation
促销灌基本页面