Merge branch 'master' of https://github.com/pluto-/Springtest

Conflicts:
	pom.xml