edit
addActivity idClub
up planning
up
BDD
Merge branch 'dev' of github.com:3104-project-team/project

Conflicts:
	import/model/lib/databasecontroller.php