Merge pull request #27 from vetrolamu/dynamic-tree

Dynamic tree
Merge branch 'master' of https://github.com/vetrolamu/edx-platform into lab
Merge branch 'lab' of https://github.com/vetrolamu/edx-platform into lab