Updated desktop build process
Merge branch 'master' of https://github.com/scripting/concord

Conflicts:
	.DS_Store