Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git

Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp