Merge branch 'master' of gitlab.inria.fr:ClassCode/class_code

ok

class_code.php

@@ -19,7 +19,7 @@
 // Includes the Class'Code functionnality implementation
 {
   include_once('posttype/quizz_post_type.php');
-  include_once('useravatar/class_code_user_avatar.php');
+  //include_once('useravatar/class_code_user_avatar.php'); les avatars sont maintenant gérés par le plugin v2
   include_once('rencontre/rencontre_post_type.php');
   include_once('rencontre/rencontre_alert.php');
   //-debug- if (is_admin()) include_once('doc/error_for_all.php');