development stuff
Merge branch 'master' of https://github.com/pawelslizak/springsample

Conflicts:
	pom.xml
hipotezy do testowania