Merge branch 'beta' into GBranch
Basic Class
New version of classes
Change
nothing
new
Merge branch 'beta' of https://github.com/geniewang/eatopian-server into beta

Conflicts:
	Service/src/main/java/com/eatopian/entity/Restaurant.java