localization and move to locale-en.json
merge from origin/master