move to spring 4. fixes #220
Merge branch 'master' into spring4

Conflicts:
	pom.xml
Merge branch 'spring4'
move to spring 4.0.2.RELEASE fixes #220