updated rails
Merge branch 'master' of github.com:jarkelen/base-app