Fix UI and Mail Template
Merge branch 'watui' of https://github.com/WatanabeYasumasa/edx-platform into watui