MARTE paper has been integrated
Merge branch 'master' of github.com:slize/MDD_Sandbox

Conflicts:
	paper/paper_conclusion.tex