Update ruby to 2.1.
Update rails to 3.2.16.
Update Gemfile.lock.
Merge branch 'feature/update-rails' into develop
Merge branch 'release/1.1.2'
Merge branch 'master' into custom