Z:sharelatex--importing and merging changes in github/en

Importing and merging changes in GitHub