Merge branch 'crfpa' of /var/git/teleforma into dev

Conflicts:
	teleforma/admin.py

diff --cc teleforma/admin.py
index fbf3caf9c4b173521665d3685a06cba43f5bbb46,9775656c7879ff33f56676e213f61aee0386f00e..459bf515f2bbe96ed3df4cd8d9038dce892e17cd
--- 1/teleforma/admin.py
--- 2/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -130,8 -53,11 +130,8 @@@ class CourseAdmin(admin.ModelAdmin)
  class DocumentAdmin(admin.ModelAdmin):
      exclude = ['readers']
      filter_horizontal = ['course_type']
-     search_fields = ['course__code', 'course__title']
 +    list_filter = ('course', 'period', 'date_added')
+     search_fields = ['course__code', 'course__title', 'type__name']
 -    list_filter = ('period', 'date_added')
  
  class MediaAdmin(admin.ModelAdmin):
      exclude = ['readers']