Merge pull request #20 from pelikanchik/master

master
translation part 11
Merge branch 'alexg' of https://github.com/pelikanchik/edx-platform into alexg
Merge pull request #21 from pelikanchik/alexg

Alexg