Merge branch 'master' into uidev
some localization keys changed
Merge branch 'uidev'