Merge pull request #1 from Senorihl/master

added bootstrap theme
Merge pull request #2 from Senorihl/master

forgot to add if connected
Merge pull request #3 from Senorihl/master

Add Site edition, creation, read /Room creation
Add delete site
Add list of site
Edit the editSite twig page for add link to delete site
Merge pull request #2 from romaricboufatis/master

Add edit site / list site / delete site
Merge branch 'Azzur-master'
Modified layout : add Location link only for admin, removed useless links, moved login and logout links
Merge branch 'master' of https://github.com/Senorihl/insta-project-php

Conflicts:
	src/Insta/PlanningBundle/Controller/LocationController.php
	src/Insta/PlanningBundle/Resources/config/routing_location.yml
Merge pull request #4 from Senorihl/master

Merge pull