Merge pull request #28 from pelikanchik/alexg

Alexg
Merge pull request #29 from pelikanchik/bt

Bt
Merge branch 'master' of https://github.com/pelikanchik/edx-platform into alexg