Merge pull request #91 from TuristAppV5/daniel

nat
Merge pull request #93 from TuristAppV5/daniel

diagram
diagram
Merge pull request #94 from TuristAppV5/jari

diagram
push
Merge pull request #95 from TuristAppV5/jari

push
Merge branch 'master' of https://github.com/TuristAppV5/TuristAppV5 into daniel

Conflicts:
	TuristAppV5/UML/ModelDefinition/UML.uml