Gemfile.lock added
Merge branch 'stable'