Back to ruby 2.0
Merge branch 'develop' into update-rails403