updated text in locale/en.yml
merge deployment branch with master