Merge branch 'pro' of git.parisson.com:git/teleforma into pro

Conflicts:
	teleforma/admin.py

diff --cc teleforma/admin.py
index 18a522d84c7903d79380c587134456e1d41abc54,c844f32fb9323fd8feb40d222154a15ca3d29001..fdd07bbd82122203d72c63458a818152fb4c7ed6
--- 1/teleforma/admin.py
--- 2/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -94,8 -94,9 +94,14 @@@ class TestimonialAdmin(admin.ModelAdmin
      search_fields = ['seminar__course__title', 'seminar__sub_title',
                      'user__username', 'user__last_name']
  
++<<<<<<< HEAD
 +class AnswerAdmin(admin.ModelAdmin):
 +    search_fields = ['user__username', 'user__last_name']
++=======
+ class SeminarRevisionAdmin(admin.ModelAdmin):
+     search_fields = ['user__username', 'seminar__title']
+ 
++>>>>>>> ab123a8a998ce88c547a184b409bb3201de46671
  
  admin.site.unregister(User)
  admin.site.register(User, UserProfileAdmin)