Merge remote-tracking branch 'mkheck/master'

# Conflicts:
#	src/main/kotlin/hello/Application.kt
#	src/main/kotlin/hello/Customer.kt

src/main/kotlin/hello/Application.kt

@@ -2,7 +2,6 @@ package hello
 
 import org.slf4j.LoggerFactory
 import org.springframework.boot.CommandLineRunner
-import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean

src/main/kotlin/hello/Customer.kt

@@ -11,4 +11,3 @@ data class Customer(
 		val lastName: String,
 		@Id @GeneratedValue
 		val id: Long = -1)
-

src/test/kotlin/hello/ApplicationTests.kt

@@ -14,8 +14,8 @@ import org.springframework.web.client.getForObject
 @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
 class ApplicationTests(@LocalServerPort port: Int, @Autowired builder: RestTemplateBuilder) {
 
-    // We don't use TestRestTemplate because of Spring Boot issues #10761 and #8062
-    private val restTemplate = builder.rootUri("http://localhost:$port").build()
+	// We don't use TestRestTemplate because of Spring Boot issues #10761 and #8062
+	private val restTemplate = builder.rootUri("http://localhost:$port").build()
 
 	@Test
 	fun findAll() {