Merge origin/master

Conflicts:
	BDD.sql