Merge branch '1.1.x'

Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,4 +76,5 @@ public class MultiProjectRepackagingTests {
 		assertThat(jarFile.getEntry("lib/projectB.jar"), notNullValue());
 		jarFile.close();
 	}
+
 }