Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  include _headers (#4636)
  Update callouts.css
  Update callouts.css

_config.yml

@@ -39,7 +39,7 @@ gems:
 # disabled gems
 #  - jekyll-redirect-from
 
-include: [_redirects]
+include: [_redirects,_headers]
 
 # SEO
 logo: /images/favicon.png

css/callouts.css

@@ -1,3 +1,4 @@
+/* Callouts */
 .caution, .note, .warning {
     padding: 20px;
     margin: 20px 0;
@@ -17,3 +18,34 @@
 .warning {
     border-left-color: #d9534f;
 }
+
+/* Feature States */
+
+.beta, .stable, .alpha, .deprecated {
+    margin-top: 20px;
+    padding: 15px;
+    background-color: #fafafa;
+    border: 1px solid transparent;
+    border-radius:4px;
+}
+
+.beta {    
+    color: #31708f;
+    border-color: #bce8f1;
+}
+
+
+.stable {    
+    color: #3c763d;
+    border-color: #d6e9c6;
+}
+
+.alpha {    
+    color: #8a6d3b;
+    border-color: #faebcc;
+}
+
+.deprecated {    
+    color: #a94442;
+    border-color: #ebccd1;
+}