Merge origin/master

Conflicts:
	app/Resources/FOSUserBundle/views/layout.html.twig
	app/Resources/TangaraUserBundle/views/layout.html.twig
	src/Tangara/AdministrationBundle/Controller/DefaultController.php
	src/Tangara/AdministrationBundle/Resources/views/Default/homepage.html.twig
	src/Tangara/ProjectBundle/Controller/DefaultController.php
	src/Tangara/ProjectBundle/Controller/FileController.php
	src/Tangara/ProjectBundle/Entity/ProjectRepository.php
	src/Tangara/ProjectBundle/Resources/config/services.yml
Merge origin/master

Conflicts:
	app/Resources/FOSUserBundle/views/layout.html.twig
	app/Resources/TangaraUserBundle/views/layout.html.twig
	src/Tangara/AdministrationBundle/Controller/DefaultController.php
	src/Tangara/AdministrationBundle/Resources/views/Default/homepage.html.twig
	src/Tangara/ProjectBundle/Controller/DefaultController.php
	src/Tangara/ProjectBundle/Controller/FileController.php
	src/Tangara/ProjectBundle/Entity/ProjectRepository.php
	src/Tangara/ProjectBundle/Resources/config/services.yml