Fixed platform scaling problem
Merge branch 'master' into CrossPlatformQml

Conflicts:
	src/uCtrlCore/uCtrlCore.pro
	src/uCtrlDesktop/main.cpp
Merge pull request #116 from uCtrl/CrossPlatformQml

Fixed platform scaling problem