Ajout des fichiers Site.php et Room.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Insta/PlanningBundle/Entity/Teacher.php
	src/Insta/PlanningBundle/Entity/User.php