upd model
Merge branch 'master' of https://github.com/picaro/cookapp-cloud

Conflicts:
	src/main/java/com/op/cookcloud/model/base/Shop.java