error
Merge branch 'master' of https://github.com/ivanovedgar/MP

Conflicts:
	Documentation/OPS/MMP_OutlineProjectSpecification.tex