Merge master into stabilization
CAL-824 Re-merge stabilization into master
Remerge master into stabilization
Use parent pom 12 to allow to release even with git 1.8.5 (PAR-286)
Crowdin injection w52 (from 20131223 to 20131225)
weekly merge master <- stabilization
Merge branch 'master' into feature/ck-editor