Non premium
Merge remote-tracking branch 'kopsy/develop-nonpremium' into develop-nonpremium

Conflicts:
	gui/MainWindow.cpp