添加样式变化
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/mobile/app/activity/activity.html
添加红包后台交互