Language file updates
Merge branch 'hotfix/20141122'
Merge branch 'master' into develop