new version
update rails version
Merge branch 'ruby-2.1'

This reverts commit 616aef439496044861840fff546bb2306ce19c46.
fix warnings
compatibility fixes