......
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	src/main.cpp
	src/restaurant.pro
	src/restaurant.pro.user
....