Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/authoring_front_end