update spring and add rest
Merge branch 'master' into develop

Conflicts:
	Spring3MVC/.classpath
	Spring3MVC/WebContent/WEB-INF/web.xml
	Spring3MVC/src/main/HelloWorldController.java
projekt bugfix