Changes related to Rails 3.1.0 env

Hi Andrew,

I committed some changes for our Rails 3.1.0 project version so when you catch
some time review it and add to your repo.
So far, we have application that is stable and running with Rails 3.1.0 and these changes
I'm sending you.

Regards,
Sinisa.