more cleanup
Merge branch 'master' of github.com:springlobby/springlobby

Conflicts:
	src/updater/updaterapp.cpp