Updated.
Merge remote-tracking branch 'origin/master'

Conflicts:
	MySpringCore/.classpath
	MySpringCore/pom.xml