JPA errors fixed
Merge branch 'master' of https://github.com/SeWitt/StoreNRent.git

Conflicts:
	app/models/Offer.java