Merge branch 'hotfix/0.1' into develop
Merge branch 'hotfix/0.2' into develop
Add Ruby version to Gemfile.
Newest jbuilder was causing trouble, revert to 2.0.7.
Merge branch 'release/v1.0rc3'