调整页面布局
Merge branch 'master' of https://github.com/breakfastTeam/breakfast

Conflicts:
	src/main/webapp/mobile/app/components/controllers.js
Merge branch 'master' of https://github.com/breakfastTeam/breakfast
添加抢红包功能