Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Corrections de définition de constantes
Merge branch 'dev'

Conflicts:
	Config/config.inc
Merge branch 'dev'
Merge branch 'dev'
Gestion des inscriptions
modif mineure
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Maj actus
Merge branch 'dev'

Conflicts:
	Documents/news.xml