Completed edit and update action
Merge branch 'charitable-controller'