updated railsexpress patches with fixes from 2.1.1
Merge pull request #2605 from skaes/2-1-railsexpress-bugfixes

updated railsexpress patches with fixes from 2.1.1