k jcapte rien
git add all
Mzerge branch 'master' of https://github.com/SulivanDotEu/natagora

Conflicts:
	vendor/composer/autoload_files.php
	vendor/friendsofsymfony/user-bundle/FOS/UserBundle
	vendor/jms/aop-bundle/JMS/AopBundle/Resources/meta/LICENSE
	vendor/jms/aop-bundle/JMS/AopBundle/phpunit.xml.dist
	vendor/jms/cg/src/CG/Core/ClassUtils.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/CHANGELOG.md
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Generator/RepositoryInjectionGenerator.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/HttpKernel/ControllerInjectorsWarmer.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Metadata/Driver/ConfiguredControllerInjectionsDriver.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/README.md
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/LICENSE
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/annotations.rst
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/configuration.rst
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/doctrine.rst
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/installation.rst
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Resources/doc/usage.rst
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Functional/AutomaticControllerInjectionsTest.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Functional/Bundle/TestBundle/Controller/AutomaticallyInjectedController.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Functional/Bundle/TestBundle/Controller/ExtendedServiceController.php
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Functional/config/automatic_controller_injections.yml
	vendor/jms/di-extra-bundle/JMS/DiExtraBundle/Tests/Metadata/Driver/ConfiguredControllerInjectionsDriverTest.php
	vendor/jms/parser-lib/doc/LICENSE
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Command/InitSecureRandomCommand.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/EventListener/SecureRandomSchemaListener.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/README.md
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/config/security_secure_random.xml
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/LICENSE
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/annotations.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/configuration.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/expressions.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/installation.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/method_security_authorization.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/doc/random_number_generator.rst
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Resources/meta/LICENSE
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Authorization/Expression/Ast/NotExpression.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Authorization/RememberingAccessDecisionManager.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Util/NullSeedProvider.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Util/SecureRandom.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Util/SecureRandomSchema.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Util/SeedProviderInterface.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Security/Util/String.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Tests/Security/Acl/Expression/HasPermissionFunctionCompilerTest.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Tests/Security/Authorization/Expression/Fixture/Issue22/Project.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Tests/Security/Authorization/Expression/Fixture/Issue22/SecuredObject.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Tests/Security/Util/SecureRandomTest.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/Tests/Security/Util/StringTest.php
	vendor/jms/security-extra-bundle/JMS/SecurityExtraBundle/phpunit.xml.dist
commit de la journée du 4 septembre, reglage de al gestion des invite et
des vue