Removed icons we aren't using any more, and fixed up the ribbon to use the correct icons.
Removed dead code and other simplifications.
Moving string literals into resource files.
Merge branch 'develop'