Updated the edit view to edit in line.

- Does not take you to a new page now, should retain page state but just
  bring up edit form.
Merge from Joe's changes overnight.
Merge branch Sprint5 into Sprint5