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

Conflicts:
	TuristAppV5/UML/ModelDefinition/UML.uml
Merge pull request #97 from TuristAppV5/daniel

Daniel