Model changes
Merge branch 'master' of https://github.com/alicjasalamon/Software-Engineering-of-Distributed-Systems---project

Conflicts:
	nbproject/private/private.xml