Desktop init to gitignore
Merge branch 'master' of github.com:LauriM/ProjectIce

Conflicts:
	.gitignore
Fixed the unit tests on windows platform.