cleaned gemfile
Merge branch 'develop'