Add dependency between user and OrderHistory
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/main/java/entity/Contact.java
Add dependency between user and OrderHistory
Add dependency between user and order, contact and order