Feature #2815 - adding data storage quota handling on spaces (collaboratives and personals)
Merge branch 'master' into feature-2815

Conflicts:
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/multilang/jobStartPagePeasBundle.properties
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/multilang/jobStartPagePeasBundle_de.properties
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/multilang/jobStartPagePeasBundle_en.properties
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/multilang/jobStartPagePeasBundle_fr.properties
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/settings/jobStartPagePeasSettings.properties
	lib-core/src/main/java/com/stratelia/webactiv/beans/admin/Domain.java
	lib-core/src/main/java/com/stratelia/webactiv/beans/admin/SpaceInst.java
	lib-core/src/main/java/org/silverpeas/admin/space/SpaceServiceFactory.java
	lib-core/src/main/java/org/silverpeas/quota/contant/QuotaType.java
	lib-core/src/main/java/org/silverpeas/quota/service/AbstractQuotaService.java
	war-core/src/main/java/com/silverpeas/jobStartPagePeas/servlets/JobStartPagePeasRequestRouter.java
	war-core/src/main/webapp/WEB-INF/config/spring-silverpeas.xml
	war-core/src/main/webapp/jobStartPagePeas/jsp/createSpace.jsp
	war-core/src/main/webapp/jobStartPagePeas/jsp/startPageInfo.jsp
	war-core/src/main/webapp/jobStartPagePeas/jsp/updateSpace.jsp
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/JobStartPagePeasSettings.java
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/control/JobStartPagePeasSessionController.java
Feature #2815 - adding data storage quota handling on spaces (collaboratives and personals)
Merge branch 'master' into feature-2815

Conflicts:
	lib-core/src/test/java/org/silverpeas/process/io/file/FileHandlerTest.java
Feature #2815 - adding data storage quota handling on spaces (collaboratives and personals)
Feature #3935 : adding a job task that cleans temporary data directory
- deleting old temporary data cleaner used only by import and export functionalities
- modifying some definitions
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
Feature #2815 : adding data storage quota handling on spaces (collaboratives and personals)
- adding a link to go back homepage of application from which the data storage quota exception has been generated
- modifying paste done treatment (Clipboard EJB)
- refactoring unit tests about FileHandler treatments
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
Feature #3839 : adding a Silverpeas Token API & REST Web-Services authentication by token.
- displaying user token in his profile
- adding Cross-Origin Resource Sharing (CORS) handling
- modifying space and component REST Web-Service to be compliant with user token handling (because of using some UI services which are not accessible via user authentication by tokens)
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
Merge branch 'master' into feature-3839
Fix the test testCompressStreamToZip in ZipManagerTest by replacing all the File.separatorChar by '/' as the path separator of the entries in ZipFile are normalized (id est / as path separator)
Merge branch 'master' into feature-2815

Conflicts:
	config-core/src/main/config/properties/org/silverpeas/jobStartPagePeas/settings/jobStartPagePeasSettings.properties
	lib-core/src/main/java/org/silverpeas/process/io/file/AbstractFileHandler.java
	war-core/src/main/webapp/jobStartPagePeas/jsp/createSpace.jsp
	war-core/src/main/webapp/jobStartPagePeas/jsp/startPageInfo.jsp
	war-core/src/main/webapp/jobStartPagePeas/jsp/updateSpace.jsp
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/JobStartPagePeasSettings.java
	web-core/src/main/java/com/silverpeas/jobStartPagePeas/control/JobStartPagePeasSessionController.java
on feature #3904, starting by replacing Castor XML by JAXB on marshalling/unmarshalling main template file
on feature #3904, removing useless code on templates
Add the release note of Silverpeas 5.11
remove duplicate : the propreties are duplicated. Removing unused ones
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
junit 4.11 : Migrating code and poms for JUnit 4.11