user entity
Midtuesday

Cart, Orderline objects added
Merge branch 'JeanClaude' into Development
Merge branch 'Benyam' into Development
Merge branch 'Development' into JeanClaude
Commit hibernate config for biny
benyfirst
new commit

added .lst and .war to ignore list
Merge remote-tracking branch 'origin/JeanClaude' into Benyam
New commit

Address objects (shipping and billing)
Temporary commit
commit
user.class
Merge branch 'Benyam' of https://github.com/claunz/MavenOnlineBusiness into Benyam

Conflicts:
	target/classes/shop/entity/User.class
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