schema changed
Merge branch 'master' of https://github.com/flylight/happy-sharing

Conflicts:
	src/main/java/com/a2n/hs/rest/OfferController.java