Poprawki
Merge branch 'master' of https://github.com/marcin-g/SPK.git

Conflicts:
	src/main/java/pl/miasi2013/spring/lab2/controller/OrderController.java
Merge branch 'master' of https://github.com/marcin-g/SPK.git