Loyaltylevel
Merge remote-tracking branch 'origin/Tunas-Roliga-Branch'

Conflicts:
	model.notation
	model.uml