Mathias changes for Windows
Merge branch 'master' of https://github.com/NPSVisionLab/matlab-bridge

Conflicts:
	MatlabBridge.py