this change accidentally was reversed, so apply it again
update changelog
update gemfile lock to use the right version of foundation again
Merge branch 'hotfix/v.2.2.1'