Merge branch 'master' of https://github.com/andzelastojanoska/food_order

Conflicts:
	FoodOrderCompleteV3/.classpath

	FoodOrderCompleteV3/target/classes/META-INF/maven/com.seavus.foodorder/FoodOrderCompleteV3/pom.properties
created Rating class, which is a join table between the m-m connection between Employee and Restaurant
Merge branch 'master' of https://github.com/andzelastojanoska/food_order

Conflicts:

	FoodOrderCompleteV3/target/classes/META-INF/maven/com.seavus.foodorder/FoodOrderCompleteV3/pom.properties