view/edit forms error trapping
Merge remote branch 'origin/master'