onetomany--->manytomany (chanel,purpose,characteristic)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/iTeam/TuibietBundle/Entity/Restaurant.php