Merge branch 'master' into mini

Conflicts:
	launcherwindow.ui