first commit of Zach
Merge branch 'master' of https://github.com/OhadR/coffee_req

Conflicts:

	coffee-req/src/main/java/com/nice/coffee/repository/OrdersRepositoryImpl.java
	coffee-req/src/main/java/com/nice/coffee/types/UserOrder.java