Some work on the Windows deployment.
Merge branch 'master' of github.com:opencor/opencor

Conflicts:
	CMakeLists.txt