Merge pull request #2452 from Diapolo/Qt_fix_GUI
Bitcoin-Qt: fix GUI after initial multi-wallet patch