Merge branch 'dev' into no-telemeta

diff --cc teleforma/admin.py
Simple merge

diff --cc teleforma/static/teleforma/css/teleforma.css
index 712fbdbc8a3c77b2dcb28067c01e2d626700c693,4ae7887e91885998f05eac48ed278aeaa64472b2..d2072d60fb8ea6e0673c486d587027d66b14177e
--- 1/teleforma/static/teleforma/css/teleforma.css
--- 2/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@@ -122,10 -122,11 +122,11 @@@ margin-bottom: 0em
  #header {
      padding: 0em;
        background-color: #000000 ;
 -    background:no-repeat url(/static/telemeta/images/tw_hd.png) 0 0;
 +    background:no-repeat url(/static/teleforma/images/tw_hd.png) 0 0;
      background-color:#ebebeb;
      background-repeat:repeat; 
-       border-top: .25em solid #6a0307;
+     /* border-top: .25em solid #6a0307; */
 -/*     background: url("/static/telemeta/images/waves.png") 100% 0% no-repeat; */
++    /*     background: url("/static/telemeta/images/waves.png") 100% 0% no-repeat; */
  }
  
  #content_header, #header{

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

diff --cc teleforma/templates/teleforma/inc/document_list.html
Simple merge

diff --cc teleforma/templates/teleforma/inc/media_list_pending.html
Simple merge

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

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

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