Merge branch 'develop' into ISSUE-107

Conflicts:
	UI/QTInstallerUI.py