Integrate ora2 will/classy branch into edx-platform