Fdsu 903 fdsu 902 edit enhancements

Nathan Vexlerrequested to merge
FDSU-903_FDSU-902_edit_enhancements into master

For quick code review.

Merge request reports