Merge branch 'windows' into DF2014

Conflicts:
	inc/dfinstancelinux.h
	src/dfinstancelinux.cpp