Merge branch 'master' of github.com:3104-project-team/project into panel_membre

Conflicts:
	model/activity.php
	model/lib/databasecontroller.php