Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Add .travis.yml
Merge branch 'develop'
Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Update gems
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master' into rails-base
Merge branch 'rails-base' into develop