H2 :  Moving some tests to H2 thus avoiding the need to have a postgresql server running
closing feature #3766
adding a 'back to results' button on publication page to go back to global results (platform global search) or to local results (application search)
closing feature #3677 (and merging from master)
bug #3521 : Every usage of a wysiwyg MUST use a language
Better usage of the language when creating a wysiwyg in kmelia

Conflicts:

	kmelia/kmelia-ejb/src/main/java/com/stratelia/webactiv/kmelia/control/ejb/KmeliaBmEJB.java
	kmelia/kmelia-war/src/main/java/com/stratelia/webactiv/kmelia/control/KmeliaSessionController.java
	kmelia/kmelia-war/src/main/java/com/stratelia/webactiv/kmelia/servlets/KmeliaRequestRouter.java
	rssaggregator/rssaggregator-jar/pom.xml
integrating fix of bug #3521
integration :  fixing bug #4342
thumbnails are generated only if image is readable by ImageIO
default preview is displayed if image is not preview-able (ie not readable)
Merge branch 'ney-feature3766' of https://github.com/NicolasEYSSERIC/Silverpeas-Components into integration

Conflicts:
	kmelia/kmelia-war/src/main/java/com/stratelia/webactiv/kmelia/control/KmeliaSessionController.java
	kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp
about bug #3957, when publications are always visible, those to validate do not appear in folder 'to validate'
H2 :  Fix merge conflicts
H2 :  Fix an execution issue coming from the merge conflict resolution
Fixing bug #4356 and bug #3289 : cleaning code of connecteurJDBC.jsp to be XHTML compliant.
Merge branch 'master' into feature-351

Conflicts:
	blog/blog-jar/src/main/java/com/silverpeas/blog/control/DefaultBlogService.java
	blog/blog-jar/src/main/java/com/silverpeas/blog/control/ejb/BlogBmEJB.java
	infoletter/infoletter-jar/src/main/java/com/stratelia/silverpeas/infoLetter/implementation/InfoLetterDataManager.java
	infoletter/infoletter-war/src/main/java/com/stratelia/silverpeas/infoLetter/control/InfoLetterSessionController.java
	kmelia/kmelia-config/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties
	kmelia/kmelia-config/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties
	kmelia/kmelia-ejb/src/main/java/com/silverpeas/kmelia/notification/KmeliaSubscriptionPublicationUserNotification.java
	kmelia/kmelia-ejb/src/main/java/com/stratelia/webactiv/kmelia/control/ejb/KmeliaBmEJB.java
	kmelia/kmelia-war/src/main/java/com/stratelia/webactiv/kmelia/control/KmeliaSessionController.java
	kmelia/kmelia-war/src/main/java/com/stratelia/webactiv/kmelia/servlets/KmeliaRequestRouter.java
	webpages/webpages-jar/src/main/java/com/silverpeas/webpages/notification/WebPagesUserNotifier.java