add editPatient template
moved form
Merge remote-tracking branch 'origin/annes_branch'