Mod_discipline → CPE peut modifier le déclarant
Correction css
Correction w3c dans mod_discipline
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'dev_discipline_declarant' into regis-master

Conflicts:
	gestion/droits_acces.php
	utilisateurs/mon_compte.php
Mod_Discipline → autoriser un CPE à saisir un incident pour un prof
Mod_discipline → CPE peut modifier le déclarant

Conflicts:

	gestion/droits_acces.php
Merge branch 'devn_discipline_cpe' into dev_cpe_declare

Conflicts:
	utilisateurs/mon_compte.php
Merge branch 'devn_cpe_change_discipline' into regis-master

Conflicts:
	mod_discipline/saisie_incident.php
	utilisateurs/mon_compte.php
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master
Merge branch 'master' of https://github.com/tbelliard/gepi.git into regis-master