Merge branch 'master' into feature/stabilization
fr injection on 20141001-005029
PLF-5829 Add configuration parameters for ECMS & WIKI cache into configuration.properties
PLF-6049 Add Wiki configuration: wiki.editPage.livingTime
PLF-6409 [Ubuntu] Office MIME type isn't recognized when uploading via WebDAV
PLF-6049 Add ECMS configuration to configuration.properties and exo-samples.properties
Merge branch 'feature/stabilization'
PLF-6082 Upgrade version of maven-parent-pom to 14-SNAPSHOT
Merge branch 'master' into feature/skin-module

Conflicts:
	pom.xml