Merge branch 'dev' into feature/multi-media-sources

diff --cc teleforma/models/core.py
Simple merge

diff --cc teleforma/templates/teleforma/course_media.html
Simple merge

diff --cc teleforma/templatetags/teleforma_tags.py
Simple merge

diff --cc teleforma/views/core.py
Simple merge