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

Conflicts:
	src/main/java/test/Main.java