点菜画面
实现了点菜画面 layout的合并
Merge branch 'master' of https://github.com/r2space/DiandianIOS

Conflicts:
	DiandianIOS/DiandianIOS.xcodeproj/project.pbxproj