fixes during madrid meeting
Merge branch 'master' of https://github.com/abieler/pyComa

Conflicts:
	bin/in_situ_tool_2.py