Feature #3447 : Wiring the File Upload Plugin
Merge branch 'master' into feature-3447

Conflicts:
	almanach/almanach-war/src/main/java/com/stratelia/webactiv/almanach/servlets/AlmanachRequestRouter.java
Feature #3447 : Wiring the File Upload Plugin
- almanach
Merge branch 'master' into feature-3447
Feature #3447 : Wiring the File Upload Plugin
- almanach
Merge branch 'master' into feature-3447
Merge branch 'feature-3447' of https://github.com/SilverYoCha/Silverpeas-Components into ych-feature3447
removing duplicated code