Uncomment edit action.
Rails 3 sample app.
Merge branch 'master' of github.com:xanagi/octopus-test