Merge branch 'crfpa' into tc202

Conflicts:
	teleforma/templates/teleforma/course_media.html

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

diff --cc teleforma/templates/teleforma/course_media.html
index c817acd4a98437c143e7491bb13cdcea2a9a8fe8,102319de5832cdea7ec5b7252a573ff087dbbca7..ad61076ab5a653aeb248a2e186d2a9ba707006a9
--- 1/teleforma/templates/teleforma/course_media.html
--- 2/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@@ -97,8 -97,7 +97,7 @@@ $(document).ready(function()
  {% if "video" in media.mime_type %}
  <div class="video">
  <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="auto" data-setup='{}' {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}{% thumbnail related.file "640" as im %}poster="{{ im.url }}"{% endthumbnail %}{% endif %}{% endfor %}{% endif %}>
- <!-- Hello Chrome and Firefox (and Opera?) -->
 -<source src="{{ MEDIA_URL }}{{ media.item.file }}" type="{{ media.mime_type }}" />
 +<source src="{{ MEDIA_URL|set_host:host }}{{ media.item.file }}" type="{{ media.mime_type }}" />
  </video>
  </div>
  

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