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
Merge branch 'master' into feature-3904

Conflicts:
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/control/JobStartPagePeasSessionController.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
Merge branch 'feature-3904' of https://github.com/NicolasEYSSERIC/Silverpeas-Core into feature-3904