Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -111,7 +111,7 @@
 		<spring-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>4.1.0.M1</spring-integration.version>
-		<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>
+		<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
 		<spring-mobile.version>1.1.2.RELEASE</spring-mobile.version>
 		<spring-social.version>1.1.0.RELEASE</spring-social.version>
 		<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>