varie
Merge remote-tracking branch 'upstream/master'

Conflicts:
	exhibition/src/main/java/org/giavacms/exhibition/controller/PublicationController.java
	github/pom.xml
	richcontent/src/main/java/org/giavacms/richcontent/controller/RichContentController.java
	richcontent/src/main/java/org/giavacms/richcontent/repository/RichContentRepository.java
	richcontent/src/main/java/org/giavacms/richcontent/repository/RichContentTypeRepository.java