Add edit page and controller
Merge branch 'master' of github.com:mattstreet/sample_app