Sync again with latest foundation after bugfix and fix demo_both

Gemfile.lock

@@ -26,14 +26,6 @@ GIT
     devise_simply_stored (0.3.0)
       devise
 
-GIT
-  remote: git://github.com/bterkuile/foundation-rails.git
-  revision: a2e857867e93a3e3bc74b4a61fe72349a86158e9
-  specs:
-    foundation-rails (5.4.3.1)
-      railties (>= 3.1.0)
-      sass (>= 3.2.0)
-
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
   revision: 354fde89a88c1384ccc9d82989e3f05ac6977bd1
@@ -207,6 +199,9 @@ GEM
       websocket-driver (>= 0.3.1)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
+    foundation-rails (5.4.4.0)
+      railties (>= 3.1.0)
+      sass (>= 3.2.0)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -329,9 +324,9 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
+    rspec-core (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec-expectations (3.1.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
     rspec-its (1.0.1)
@@ -441,7 +436,7 @@ DEPENDENCIES
   factory_girl_rails
   faye
   font-awesome-rails
-  foundation-rails!
+  foundation-rails
   fuubar
   iso_country_codes
   jquery-rails