Git znow nie chcia³ cofnac zmian
Merge branch 'master' of github.com:marcin-g/SPK

Conflicts:
	src/main/resources/spring-context.xml