temporal commit for rebasing...
Merge branch 'wat0325' of https://github.com/nttks/edx-platform into wat0325