Merge branch 'joeworkman-permission-fix' into version-test

diff --cc Gruntfile.js
index 9ac873ddd99c52d6c9bf0426e2b839173f6e13f4,697331e2faffcf072fc64bce0fb484897031d626..9ac873ddd99c52d6c9bf0426e2b839173f6e13f4
mode 100755,100644..100644
--- 1/Gruntfile.js
--- 2/Gruntfile.js
+++ b/Gruntfile.js

diff --cc bower.json
index 8ddc58ac93c9f12a7b0cedcbf0dc64da50aea393,6f99f655cc23e1ca8990c0e729a37635bf3b4fbb..8ddc58ac93c9f12a7b0cedcbf0dc64da50aea393
mode 100755,100644..100644
--- 1/bower.json
--- 2/bower.json
+++ b/bower.json

diff --cc js/foundation/foundation.abide.js
index 8994d417efd97bfc40d104a0c8c2fe923b6c6d4a,9d24f25a1022698a8d58ad153b22fee5f167176b..8994d417efd97bfc40d104a0c8c2fe923b6c6d4a
mode 100755,100644..100644
--- 1/js/foundation/foundation.abide.js
--- 2/js/foundation/foundation.abide.js
+++ b/js/foundation/foundation.abide.js

diff --cc js/foundation/foundation.accordion.js
index 9622637207c0a0b425041a75fa3b70ec54e628d7,777f87154b0d1500662ed75bfcc17cc00cd1e169..9622637207c0a0b425041a75fa3b70ec54e628d7
mode 100755,100644..100644
--- 1/js/foundation/foundation.accordion.js
--- 2/js/foundation/foundation.accordion.js
+++ b/js/foundation/foundation.accordion.js

diff --cc js/foundation/foundation.alert.js
index 1453169d13ca1b7fd7a8c91d730f89ca0424be70,ef8c9881752d95959025ef0b50e3c3c31bd5d7b8..1453169d13ca1b7fd7a8c91d730f89ca0424be70
mode 100755,100644..100644
--- 1/js/foundation/foundation.alert.js
--- 2/js/foundation/foundation.alert.js
+++ b/js/foundation/foundation.alert.js

diff --cc js/foundation/foundation.clearing.js
index b91a8a05817553ff7a2caecb817ceec97505a898,d1c3c753ac7bbb2297386b02375201e8e893b45d..b91a8a05817553ff7a2caecb817ceec97505a898
mode 100755,100644..100644
--- 1/js/foundation/foundation.clearing.js
--- 2/js/foundation/foundation.clearing.js
+++ b/js/foundation/foundation.clearing.js

diff --cc js/foundation/foundation.dropdown.js
index b919d1b2c7dbf1c5384c8679c298f7b0043974de,68e4b87450252efd198dedc85af1344aa00f519a..b919d1b2c7dbf1c5384c8679c298f7b0043974de
mode 100755,100644..100644
--- 1/js/foundation/foundation.dropdown.js
--- 2/js/foundation/foundation.dropdown.js
+++ b/js/foundation/foundation.dropdown.js

diff --cc js/foundation/foundation.equalizer.js
index d85901e19312c49f68c165f4f4ed053f514af5c2,dde2da72ab499e9bcfe418a58be46ec25f418a0e..d85901e19312c49f68c165f4f4ed053f514af5c2
mode 100755,100644..100644
--- 1/js/foundation/foundation.equalizer.js
--- 2/js/foundation/foundation.equalizer.js
+++ b/js/foundation/foundation.equalizer.js

diff --cc js/foundation/foundation.interchange.js
index ddc6420ecd656e59727f17843430d6f562c46cb4,8d8b05e7f949ebcd7f91710ec93f718dc9f0f69c..ddc6420ecd656e59727f17843430d6f562c46cb4
mode 100755,100644..100644
--- 1/js/foundation/foundation.interchange.js
--- 2/js/foundation/foundation.interchange.js
+++ b/js/foundation/foundation.interchange.js

diff --cc js/foundation/foundation.joyride.js
index c0731b051cce778c238fdb9193a6a5683007bbff,5916b27becc7c924aec0ce384acb9ab0eb77dc97..c0731b051cce778c238fdb9193a6a5683007bbff
mode 100755,100644..100644
--- 1/js/foundation/foundation.joyride.js
--- 2/js/foundation/foundation.joyride.js
+++ b/js/foundation/foundation.joyride.js

diff --cc js/foundation/foundation.js
index dd4e92d78c7d230deef3510f30a385e0b21d75c0,61c632ec9be861b368b0537b648b7aa3902cf17a..dd4e92d78c7d230deef3510f30a385e0b21d75c0
mode 100755,100644..100644
--- 1/js/foundation/foundation.js
--- 2/js/foundation/foundation.js
+++ b/js/foundation/foundation.js

diff --cc js/foundation/foundation.magellan.js
index 65af76802d77d232410c95eec49e9df854fb8812,9158f73f9d4b553da47fbeffa1ff9355bc345b26..65af76802d77d232410c95eec49e9df854fb8812
mode 100755,100644..100644
--- 1/js/foundation/foundation.magellan.js
--- 2/js/foundation/foundation.magellan.js
+++ b/js/foundation/foundation.magellan.js

diff --cc js/foundation/foundation.orbit.js
index 2eb0cb1916211c943f37e5312cd631b118b212aa,aba8b3cadf207392982fd6c069b7198dfdb6dccd..2eb0cb1916211c943f37e5312cd631b118b212aa
mode 100755,100644..100644
--- 1/js/foundation/foundation.orbit.js
--- 2/js/foundation/foundation.orbit.js
+++ b/js/foundation/foundation.orbit.js

diff --cc js/foundation/foundation.reveal.js
index 362f1c9bd7360bc49ee67e377772c31a0b914a51,0514286191ae6627512dec74c001e385cd1d0566..362f1c9bd7360bc49ee67e377772c31a0b914a51
mode 100755,100644..100644
--- 1/js/foundation/foundation.reveal.js
--- 2/js/foundation/foundation.reveal.js
+++ b/js/foundation/foundation.reveal.js

diff --cc js/foundation/foundation.slider.js
index 51200b3454f3f327b1a3cc82ba584b57bcbce102,87588eace02bdb9b3c31a224e803c8f8a271745d..51200b3454f3f327b1a3cc82ba584b57bcbce102
mode 100755,100644..100644
--- 1/js/foundation/foundation.slider.js
--- 2/js/foundation/foundation.slider.js
+++ b/js/foundation/foundation.slider.js

diff --cc js/foundation/foundation.tab.js
index 59d768f2da87217a5c3cade2c84f61568d7fdbee,3c8d8fd75781eb7e05219473747f42a6ee5b74df..59d768f2da87217a5c3cade2c84f61568d7fdbee
mode 100755,100644..100644
--- 1/js/foundation/foundation.tab.js
--- 2/js/foundation/foundation.tab.js
+++ b/js/foundation/foundation.tab.js

diff --cc js/foundation/foundation.tooltip.js
index 6d7388e0522b4be6544ac210fd62d2a9c7b72c63,7444a34003167fb8aec224fa385e006176d425c4..6d7388e0522b4be6544ac210fd62d2a9c7b72c63
mode 100755,100644..100644
--- 1/js/foundation/foundation.tooltip.js
--- 2/js/foundation/foundation.tooltip.js
+++ b/js/foundation/foundation.tooltip.js

diff --cc js/foundation/foundation.topbar.js
index 24539f45d6a17ad6d54a0fb2b31511d7de65d458,432901ca51f7ee89dbdb87e342e52ff363351be3..24539f45d6a17ad6d54a0fb2b31511d7de65d458
mode 100755,100644..100644
--- 1/js/foundation/foundation.topbar.js
--- 2/js/foundation/foundation.topbar.js
+++ b/js/foundation/foundation.topbar.js

diff --cc package.json
index 9f538445ebc6ee27d6f736ca8c148f04c1543d49,6b3d9191192694a46eae60d31a3f51ee1d939292..9f538445ebc6ee27d6f736ca8c148f04c1543d49
mode 100755,100644..100644
--- 1/package.json
--- 2/package.json
+++ b/package.json

diff --cc scss/foundation/components/_global.scss
index 267371fb0ccc3be4e238a7644912f58058b97f9b,8a4b4089cdb5833551c47da1b17b0bae11565768..267371fb0ccc3be4e238a7644912f58058b97f9b
mode 100755,100644..100644
--- 1/scss/foundation/components/_global.scss
--- 2/scss/foundation/components/_global.scss
+++ b/scss/foundation/components/_global.scss