Merge origin/master

Conflicts:
	bdd.sql
	model/Adresse.model.php
	model/Image.model.php
	model/Organisateur.model.php
	model/Participant.model.php
Merge origin/master
Merge origin/master

Conflicts:
	bdd.sql
	model/Adresse.model.php
	model/Image.model.php
	model/Organisateur.model.php
	model/Participant.model.php