ict-group
aggiunto people per autori del richcontent
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vandel/src/main/resources/META-INF/persistence.xml