Fixed cross-platform issues.
Merge branch 'windows-beta' into linux-beta

Conflicts:
	lib/pvd.lib
	lib/pvmmd.lib