Merge pull request #755 from magcius/clean-up-nogui Allow building MainNoGUI and MainGUI simultaneously
