Merge master into feature/stabilization
Crowdin injection w4 - Update Norwegian files on 20140121 and 20140122
Crowdin injection w6 (from 20140204 to 20140205)
Merge feature/stabilization into master.
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ