Merge branch 'develop' of https://github.com/tanzolone/test into develop

Conflicts:
	Test/TestClass.m