sss
Merge branch 'select' of https://github.com/Man2Life/edx-platform into select