Merge branch 'master' of /disk01/SeaDAS/seadas with conflicts.
Merge remote-tracking branch 'origin/master'
Icon cleanup.  Added some, removed some per out meeting.  All this involved changes to SeadasApp.  VisatApp only needed a couple methods converted from private to protected.  Minor changes to the module.xml files to change docking and add in new icons
Merge remote-tracking branch 'origin/master'