PAckage + associacions
Test
Test2
Test3
Test4
Revert "Class diagram quick update"

This reverts commit b810dbe53d7e5c21e2183e794a243fbd247f50b7.

Conflicts:
	PSI.mdj
Merge branch 'Vladux13-master'