Merge branch '1.2.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -225,13 +225,13 @@ content into your application; rather pick only the properties that you need.
 
 	# MUSTACHE TEMPLATES ({sc-spring-boot-autoconfigure}/mustache/MustacheAutoConfiguration.{sc-ext}[MustacheAutoConfiguration])
 	spring.mustache.cache=true
-    spring.mustache.charset=UTF-8
-    spring.mustache.check-template-location=true
-    spring.mustache.content-type=UTF-8
-    spring.mustache.enabled=true # enable MVC view resolution
-    spring.mustache.prefix=
-    spring.mustache.suffix=.html
-    spring.mustache.view-names= # whitelist of view names that can be resolved
+	spring.mustache.charset=UTF-8
+	spring.mustache.check-template-location=true
+	spring.mustache.content-type=UTF-8
+	spring.mustache.enabled=true # enable MVC view resolution
+	spring.mustache.prefix=
+	spring.mustache.suffix=.html
+	spring.mustache.view-names= # whitelist of view names that can be resolved
 
 	# JERSEY ({sc-spring-boot-autoconfigure}}/jersey/JerseyProperties.{sc-ext}[JerseyProperties])
 	spring.jersey.type=servlet # servlet or filter

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -1117,6 +1117,7 @@ Spring Boot includes auto-configuration support for the following templating eng
  * http://docs.groovy-lang.org/docs/next/html/documentation/template-engines.html#_the_markuptemplateengine[Groovy]
  * http://www.thymeleaf.org[Thymeleaf]
  * http://velocity.apache.org[Velocity]
+ * http://mustache.github.io/[Mustache]
 
 TIP: JSPs should be avoided if possible, there are several
 <<boot-features-jsp-limitations, known limitations>> when using them with embedded