Upgrade rails
Fix models
Merge pull request #1 from vadus1/upgrate-rails-4

Upgrate rails 4