work on menu
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta

Conflicts:
	Service/src/main/java/com/eatopian/dao/RestaurantDao.java