Updated Gemfiles
Merge branch 'dev' into feature/ui