Merge branch 'develop' into kball-grid-experiments

diff --cc scss/foundation.scss
index 301c4683c39d48885d227073e2485b879d7ec4a9,9ad00cfaada7c83bc17f93d39ec3364930f37979..4269dc611421c59a7dfb06cbd14f9e650930c359
--- 1/scss/foundation.scss
--- 2/scss/foundation.scss
+++ b/scss/foundation.scss
@@@ -64,8 -63,12 +64,12 @@@
  @import 'components/top-bar';
  @import 'components/thumbnail';
  @import 'components/tooltip';
+ @import 'prototype/prototype';
  
- @mixin foundation-everything($flex: true) {
+ @mixin foundation-everything(
 -  $flex: false,
++  $flex: true,
+   $prototype: false
+ ) {
    @if $flex {
      $global-flexbox: true !global;
    }