Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro

Conflicts:
	teleforma/templates/teleforma/seminar_media_video.html

diff --cc teleforma/templates/teleforma/seminar_media_video.html
index d3574326c75568985dc3fd8fae2bdf685697b692,d3ab785acb4db264238af998c860e91463505ad2..0cb7dd16a97d86b7037df00cd464e78cd525efe6
--- 1/teleforma/templates/teleforma/seminar_media_video.html
--- 2/teleforma/templates/teleforma/seminar_media_video.html
+++ b/teleforma/templates/teleforma/seminar_media_video.html
@@@ -96,7 -96,8 +96,7 @@@ $(window).ready(function()
  <div class="media">
  
  <div class="video">
- <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="metadata" {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}poster="{{ MEDIA_URL }}{{ related.file }}"{% endif %}{% endfor %}{% endif %} data-setup='{}'>
+ <video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="none" {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}poster="{{ MEDIA_URL }}{{ related.file }}"{% endif %}{% endfor %}{% endif %} data-setup='{}'>
 -    <source src="{{ MEDIA_URL }}{{ media.item.file }}#t=0" type="{{ media.mime_type }}" />
    {% for transcoded in media.item.transcoded.all %}
     {% if "video" in transcoded.mime_type %}
      <source src="{{ MEDIA_URL }}{{ transcoded.file }}#t=0" type="{{ transcoded.mime_type }}" />