Merge pull request #1 from edx/master

master -> vetrolamu
origin
Merge branch 'dynamic-tree' of https://github.com/vetrolamu/edx-platform into dynamic-tree
update
Merge pull request #2 from vetrolamu/dynamic-tree

Dynamic tree
solve progress problem
solve progress problem with russian language
Merge pull request #3 from vetrolamu/dynamic-tree

Dynamic tree
Division by zero repair
Merge pull request #4 from vetrolamu/master

hi
Правильная привязка по id
Merge pull request #5 from vetrolamu/alexg

Alexg
Правильная привязка по id
Merge pull request #6 from vetrolamu/alexg

Правильная привязка по id
Locking update
Merge pull request #7 from vetrolamu/alexg

Locking update
Merge pull request #8 from edx/master

update from edx-platform
Revert "Merge pull request #8 from edx/master"

This reverts commit b9abf796c0e687fb77f1025d80e8f18a2167256a, reversing
changes made to 6ee483bf4b059941e06b535ad626d73652531850.
update
Merge pull request #10 from vetrolamu/alexg

Alexg