further delete and modify
Changed Gemfile.lock
Merge branch 'develop'