Merge master into feature/stabilization
Crowdin injection w3 - Add Norwegian files on 20140116
Merge feature/stabilization to master
Merge branch 'master' into feature/upgrade-gatein-3.7.x