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

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