Third test
Merge branch 'edulib' of https://github.com/EDUlib/edx-platform into edulib

Conflicts:
	README.edulib

Third test bis