Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages into gh-pages

Conflicts:
	_includes/billboard.html

_includes/billboard.html

@@ -17,6 +17,12 @@
                             <a href="{{ site.github_repo_url }}" class="project-link">
                                 <i class="icon-github"></i>
                             </a>
+{% if site.forum %}
+                            <a href="{{ site.forum }}" class="project-link project-link-forum">
+                                <div class="spring-icon spring-icon-forum">
+                                </div>
+                            </a>
+{% endif %}
                         </div>
                     </div>
 

_includes/project_sidebar.html

@@ -1,11 +1,9 @@
 {% include documentation.html %}
-{%unless badges contains 'not found in _includes directory' %}
 <div class="right-pane-widget--container no-top-border">
     <div class="project-sub-link--wrapper">
         {% include badges.html %}
     </div>
 </div>
-{%endunless%}
 <div class="right-pane-widget--container no-top-border project-sidebar-resource--wrapper">
     {{ related_resources | markdownify }}
 </div>

_includes/widget_templates.html

@@ -62,11 +62,11 @@
 </script>
 
 
+{% if site.custom_pom_template %}
 {% capture maven_pom_template %}
 {% include pom.xml %}
 {% endcapture %}
-
-{%if maven_pom_template contains 'not found in _includes directory' %}
+{% else %}
 {% capture maven_pom_template %}
 <dependencies>
     <dependency>
@@ -99,11 +99,11 @@
 {% endhighlight %}
 </script>
 
+{% if site.custom_gradle_template %}
 {% capture gradle_template %}
 {% include build.gradle %}
 {% endcapture %}
-
-{%if gradle_template contains 'not found in _includes directory' %}
+{% else %}
 {% capture gradle_template %}
 dependencies {
     compile '{@= groupId @}:{@= artifactId @}:{@= version @}'