Added spring_context.xml
Merge branch 'master' of https://github.com/zwvista/LollySwing

Conflicts:
	.classpath