view forms error trapping
new icons
Merge remote branch 'origin/master'