Merge branch 'master' of https://github.com/KPIProjects/Threatre

Conflicts:
	TheatreUML/Theatre/AnalysisTheatre.oob
	TheatreUML/Theatre/AnalysisTheatre.oom