some little changes
Merge branch 'master' of github.com:slize/MDD_Sandbox

Conflicts:
	paper/paper_conclusion.pdf
Merge branch 'master' of github.com:slize/MDD_Sandbox
basics and uml added to paper conclusion
Merge branch 'master' of github.com:slize/MDD_Sandbox

Conflicts:
	paper/basics.tex