1t
Merge branch 'pre-master' of https://github.com/pelikanchik/edx-platform into pre-master
fix conflict in useless file display_spec.js