http tests
cachhe
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	contactus/src/main/java/org/giavacms/contactus/controller/request/NewsLetterEmailRequestController.java
	faq/src/main/java/org/giavacms/faq/controller/request/FaqRequestController.java
Merge pull request #67 from pisi79/master

exhibition temporarirly out of pom and richcontent save/update broken