made updater not hang the launcher on windows
Merge remote-tracking branch 'origin/development' into bleeding-edge
Merge remote-tracking branch 'origin/bleeding-edge'
make launcher no longer hang while updater is running