Merge branch 'master' into feature-351

Conflicts:
	blog/blog-jar/src/main/java/com/silverpeas/blog/control/DefaultBlogService.java
	infoletter/infoletter-jar/src/main/java/com/stratelia/silverpeas/infoLetter/implementation/InfoLetterDataManager.java
	infoletter/infoletter-jar/src/main/java/com/stratelia/silverpeas/infoLetter/model/InfoLetterDataInterface.java
	infoletter/infoletter-war/src/main/java/com/stratelia/silverpeas/infoLetter/control/InfoLetterSessionController.java
	infoletter/infoletter-war/src/main/java/com/stratelia/silverpeas/infoLetter/servlets/InfoLetterRequestRouter.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
	question-reply/question-reply-jar/src/main/java/com/silverpeas/questionReply/control/SilverpeasQuestionManager.java