pierwsza
Merge branch 'master' of https://github.com/krozycki/WebShop

Conflicts:
	src/pl/edu/uj/tcs/webshop/client/WebShop.java
	src/pl/edu/uj/tcs/webshop/server/ProductServiceImpl.java
Merge branch 'master' of https://github.com/krozycki/WebShop

Conflicts:
	src/pl/edu/uj/tcs/webshop/client/WebShop.java