merge
Merge branch 'master' of https://github.com/Desom/NUI_Code.git

Conflicts:
	.pydevproject