put in Dan's windows build fix to finish the pending big merge of master and Moritz's WORKING_BRANCH
Merge pull request #484 from moritzdannhauer/WORKING_BRANCH

Closes #454, closes #346, closes #55, closes #455.
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype