Add .ruby-version
Merge branch 'develop'