Change from workspace B
Merge branch 'master' of https://github.com/vschmidt82/Spring.git

Conflicts:
	Spring/src/com/example/SpringExample.java