Merge branch 'minor_updates' into staging
Merge branch 'responsive' into staging
Merge branch 'responsive' into staging
Merge branch 'responsive' into staging
Merge branch 'responsive' into staging
Merge branch 'steve' into staging
Merge branch 'steve' into staging
Fixing Gemfile