Temporary commit
commit
Merge branch 'Benyam' into UserEntityBugFix

Conflicts:
	target/classes/shop/entity/User.class
User class conflict resolve
Hibernate Table autocreate
shipping class
Merge branch 'UserEntityBugFix' into Benyam
commit