Add edit form for activities with controller action
Merge branch 'master' into ActivityEdit