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

Conflicts:
	MatlabBridge.py
Merge pull request #2 from sgsun9/master

Mathias changed.