on feature #3904, starting by replacing Castor XML by JAXB on marshalling/unmarshalling main template file
on feature #3904, removing useless code on templates
closing feature #3904
feature #4115 : Using secure cookie if we are in a ssl connection
Using httpOnly cookies for authentication
Cleaning some old jsp code
Merge branch 'master' into feature-3904

Conflicts:
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/control/JobStartPagePeasSessionController.java
on feature #4011 :
- files of type 'mail' are processed on drag n' drop
- creating a new service to extract data from EML and MSG files
- creating associated tests
on feature #4011, improving support of MSG file format
adding test cases
Feature #4011 : Extracting data from mail file which extension is EML or MSG.
on feature #4011, integrating Yohann's work about conversion of RTF to HTML
on feature #4011, TO and CC fields are correctly managed with MSG files
on feature #4011, using message information to generate publication header
Feature #4150 : user connection attempts before blocking user account
- refactoring some code
- adding user connection attempt verifier
- saving the last date of successful user connection
Merge branch 'master' into feature-4150

Conflicts:
	lib-core/src/main/java/com/stratelia/silverpeas/authentication/AuthenticationUserAccountBlockedException.java
	lib-core/src/main/java/com/stratelia/silverpeas/authentication/verifier/exception/AuthenticationUserAccountBlockedException.java
	lib-core/src/main/java/org/silverpeas/authentication/AuthenticationService.java
	lib-core/src/main/java/org/silverpeas/authentication/AuthenticationUserAccountBlockedException.java
	lib-core/src/main/java/org/silverpeas/authentication/AuthenticationUserStateChecker.java
	web-core/src/main/java/com/silverpeas/authentication/AuthenticationServlet.java
	web-core/src/main/java/com/silverpeas/authentication/SilverpeasSessionOpenener.java
	web-core/src/main/java/com/silverpeas/socialnetwork/authentication/SocialNetworkLoginController.java
	web-core/src/main/java/com/silverpeas/web/UserPriviledgeValidation.java
	web-core/src/main/java/com/stratelia/silverpeas/peasCore/servlets/ComponentRequestRouter.java
	web-core/src/main/java/com/stratelia/webactiv/servlets/CredentialsServlet.java
	web-core/src/main/java/com/stratelia/webactiv/servlets/credentials/ChangeExpiredPasswordHandler.java
	web-core/src/main/java/com/stratelia/webactiv/servlets/credentials/EffectiveChangePasswordHandler.java
Merge branch 'master' into feature-3904

Conflicts:
	web-core/src/main/java/com/stratelia/webactiv/util/viewGenerator/html/JavascriptPluginInclusion.java
	web-core/src/main/java/com/stratelia/webactiv/util/viewGenerator/html/SupportedJavaScriptPlugins.java
Feature #4150 : user connection attempts before blocking user account
- using new containers created by Miguel
- renaming some methods
- refactoring some code
Merge branch 'master' into feature-4150
closing first part of feature #3689
adding links to sort users (only on ALL and DOMAINS directories)
links are not available on search results
on feature #3689, formatting code and removing obsolete files
on feature #3689 :
- moving existing StringTemplate files into 'core' subdirectory
- removing obsolete entries in settings file
closing feature #3689 by adding second part of the feature
Displaying a help message which is managed by a cookie
However, this message can be displayed at any time when clicking on the 'Help' link
This message can be customized with the help of StringTemplate