Merge branch '4.3.0-wip' of github.com:FortAwesome/Font-Awesome into 4.3.0-wip

* '4.3.0-wip' of github.com:FortAwesome/Font-Awesome:
  adding bed / hotel icon #14 #97

README.md

@@ -1,7 +1,7 @@
 #[Font Awesome v4.3.0](http://fontawesome.io)
 ###The iconic font and CSS framework
 
-Font Awesome is a full suite of 514 pictographic icons for easy scalable vector graphics on websites,
+Font Awesome is a full suite of 515 pictographic icons for easy scalable vector graphics on websites,
 created and maintained by [Dave Gandy](http://twitter.com/davegandy).
 Stay up to date [@fontawesome](http://twitter.com/fontawesome).
 

css/font-awesome.css

@@ -1777,3 +1777,7 @@
 .fa-user-times:before {
   content: "\f235";
 }
+.fa-hotel:before,
+.fa-bed:before {
+  content: "\f236";
+}

less/icons.less

@@ -587,3 +587,5 @@
 .@{fa-css-prefix}-server:before { content: @fa-var-server; }
 .@{fa-css-prefix}-user-plus:before { content: @fa-var-user-plus; }
 .@{fa-css-prefix}-user-times:before { content: @fa-var-user-times; }
+.@{fa-css-prefix}-hotel:before,
+.@{fa-css-prefix}-bed:before { content: @fa-var-bed; }

less/variables.less

@@ -57,6 +57,7 @@
 @fa-var-bar-chart-o: "\f080";
 @fa-var-barcode: "\f02a";
 @fa-var-bars: "\f0c9";
+@fa-var-bed: "\f236";
 @fa-var-beer: "\f0fc";
 @fa-var-behance: "\f1b4";
 @fa-var-behance-square: "\f1b5";
@@ -283,6 +284,7 @@
 @fa-var-history: "\f1da";
 @fa-var-home: "\f015";
 @fa-var-hospital-o: "\f0f8";
+@fa-var-hotel: "\f236";
 @fa-var-html5: "\f13b";
 @fa-var-ils: "\f20b";
 @fa-var-image: "\f03e";

scss/_icons.scss

@@ -587,3 +587,5 @@
 .#{$fa-css-prefix}-server:before { content: $fa-var-server; }
 .#{$fa-css-prefix}-user-plus:before { content: $fa-var-user-plus; }
 .#{$fa-css-prefix}-user-times:before { content: $fa-var-user-times; }
+.#{$fa-css-prefix}-hotel:before,
+.#{$fa-css-prefix}-bed:before { content: $fa-var-bed; }

scss/_variables.scss

@@ -57,6 +57,7 @@ $fa-var-bar-chart: "\f080";
 $fa-var-bar-chart-o: "\f080";
 $fa-var-barcode: "\f02a";
 $fa-var-bars: "\f0c9";
+$fa-var-bed: "\f236";
 $fa-var-beer: "\f0fc";
 $fa-var-behance: "\f1b4";
 $fa-var-behance-square: "\f1b5";
@@ -283,6 +284,7 @@ $fa-var-heartbeat: "\f21e";
 $fa-var-history: "\f1da";
 $fa-var-home: "\f015";
 $fa-var-hospital-o: "\f0f8";
+$fa-var-hotel: "\f236";
 $fa-var-html5: "\f13b";
 $fa-var-ils: "\f20b";
 $fa-var-image: "\f03e";

src/icons.yml

@@ -5014,3 +5014,14 @@ icons:
     created:    4.3
     categories:
       - Web Application Icons
+
+  - name:       Bed
+    id:         bed
+    unicode:    f236
+    created:    4.3
+    filter:
+      - travel
+    aliases:
+      - hotel
+    categories:
+      - Web Application Icons