Foundation JS files fix, Tabs Template Update
Merge branch 'master' into dev

Conflicts:

wp-content/themes/default/.sass-cache/d5c766aa8a0791a933a098b7b5806b0115
476648/style.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_accordion.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_alert-boxes.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_block-grid.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_breadcrumbs.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_button-groups.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_buttons.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_dropdown-buttons.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_dropdown.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_forms.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_global.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_grid.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_keystrokes.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_offcanvas.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_orbit.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_pagination.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_panels.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_progress-bars.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_reveal.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_side-nav.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_sub-nav.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_switch.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_tables.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_tabs.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_thumbs.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_tooltips.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_top-bar.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_type.scssc

wp-content/themes/default/.sass-cache/f8908265e29858bab24bfabb21229e491d
f7e5dc/_visibility.scssc
Merge pull request #1 from farner/dev

Foundation JS files fix, Tabs Template Update