fixing bug #4493
subscribers of taxonomy are no more immediately notified when new contribution is created
Fix the conflict coming from the correction of the bug #4372
Fix the conflict coming from the correction of the bug #4497
Fix the conflict coming from the correction of the bug #4499
Feature #4286 : upgrading resource manager application
- changing the calendar mechanism (using the same that the one of Almanach application)
- adding some new features to choose more freely how to display the calendar
- adding Web Services that expose reservation data
- refactoring some code
- harmonizing the display of the current period label with applications that are using a calendar
Merge branch 'master' into feature-4286

Conflicts:
	almanach/almanach-war/src/main/java/com/stratelia/webactiv/almanach/control/AlmanachSessionController.java
Fixing alter message when going out of draft mode and publication classification is not mandatory
Fixing the case of diaplaying the list of publications to validate
Fix the bad sql instruction for MSSQL
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Components
Fixing the case of diaplaying the list of publications to validate
Fix the bad sql instruction for MSSQL
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Components
Fix the bad sql instruction for Oracle
Feature #4286 : upgrading resource manager application
- fixing Almanach application to use the user language in account
- fixing Blog application technical error introduced by Feature #351
- integrating Aurore's design work
- adding tooltip description on resource selection (when the mouse cursor is on a name of a resource)
Merge branch 'master' into feature-4286
Fixing bug in reformatting of JSP file
Fixing bug in redirection to Toolbox publication
Small reformatting
Feature #351 : fixing technical error on kmelia notifications