Merge branch 'master' of D:\projects\MyShopGradle - Copy with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/springapp/domain/Order.java
	src/main/java/com/springapp/domain/Product.java
	src/main/java/com/springapp/domain/ShoppingCart.java
	src/main/java/com/springapp/repository/ProductPredicate.java
	src/main/java/com/springapp/repository/ProductRepository.java
	src/main/scala/com/springapp/domain/OrderDetail.scala
	src/main/scala/com/springapp/domain/Product.scala
	src/main/scala/com/springapp/domain/ShoppingCart.scala
	src/main/scala/com/springapp/repository/ProductRepository.scala
	src/main/scala/com/springapp/service/OrderServiceImpl.scala
asd