master
Merge remote-tracking branch 'origin/master'

Conflicts:
	TuristAppV5/UML/UML.modelproj