38da92b048 Fixes to bad-merging.
812d2d97f8 Merge commit '320e525a'
6fc726e560 All changes from previous repository. No new file is added here.

git-subtree-dir: moose-gui
git-subtree-split: 38da92b0481f53ffd2cdc75d8f7aec49408dc4ae