Updated localization
Updated date
Merge branch 'master' into beta