change wording according to feedback
Merge branch 'master' of github.com:zanata/zanata into integration/master
change wording according to feedback
change default editor option
Merge branch 'work' into integration/master