Merge master into feature/stabilization branch
WIKI-795 : Update version of kernel | core | jcr | ws | gatein to be compliant with plf-4.x
Crowdin injection w51 (Simplified Chinese, Arabic on 20131217)
Merge feature/statbilization into master
Merge master into feature/stabilization branch
Correct the version in the main pom after merging
Merge feature/stabilization into master branch
Merge master into feature/statbilization branch
Merge branch 'feature/stabilization'
Merge master into feature/stabilization branch
Use parent pom 12 to allow to release even with git 1.8.5 (PAR-286)
Merge branch 'feature/stabilization' into feature/skin-module

Conflicts:
	pom.xml
	wiki-extension/pom.xml
	wiki-extension/wiki-extension-webapp/pom.xml
	wiki-injector/pom.xml
	wiki-macros/pom.xml
	wiki-macros/wiki-macros-iframe/pom.xml
	wiki-renderer/pom.xml
	wiki-service/pom.xml
	wiki-upgrade-plugins/pom.xml
	wiki-webapp/pom.xml
	wiki-webui/pom.xml