Maintenance is done and has been tested.  There will need to be some
error checking done.  For example if you dont click a radio button
before pressing edit or delete it will break.
Merge remote-tracking branch 'origin/master'