f-ing gem version changes
finding the right fog
Merge branch 'production'
Merge branch 'master' into feature/landingpage