"Just viewed ShoppingCartDto"
Merge branch 'master' of https://github.com/maeyan-zero/cyber-solution

Conflicts:
	src/main/java/cybersolution/domain/ShoppingCartDto.java
	src/main/java/cybersolution/rest/ProductRestService.java