Merge branch 'master' into feature/stabilization
Crowdin injection w3 - Add Norwegian files on 20140116
CAL-789 fix beginning of the comment
CAL-789 fixed in french language problem
Merge branch 'feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ