Merge branch 'release/0.0.0'
Merge branch 'develop'
Update ruby version
Merge branch 'hotfix/1391398766-update-ruby-version'
Merge branch 'hotfix/1391398766-update-ruby-version' into develop
Update layout.haml
Merge branch 'hotfix/1391411340' into develop