commit comment
ggg
Merge branch 'master' of https://github.com/martin-fr/Symfony

Conflicts:
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/friendsofsymfony/comment-bundle/FOS/CommentBundle

vendor/friendsofsymfony/rest-bundle/FOS/RestBundle/Controller/Annotation
s/Options.php
	vendor/jms/parser-lib/doc/LICENSE
	vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/LICENSE

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/configur
ation.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/cookbook
.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/cookbook
/exclusion_strategies.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/handlers
.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/installa
tion.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/referenc
e.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/referenc
e/annotations.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/referenc
e/xml_reference.rst

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/doc/usage.rs
t

vendor/jms/serializer-bundle/JMS/SerializerBundle/Resources/meta/LICENSE
	vendor/jms/serializer-bundle/JMS/SerializerBundle/Tests/bootstrap.php
	vendor/jms/serializer-bundle/JMS/SerializerBundle/phpunit.xml.dist
	vendor/jms/serializer/doc/LICENSE
	vendor/jms/serializer/doc/cookbook.rst
	vendor/jms/serializer/doc/cookbook/exclusion_strategies.rst
	vendor/jms/serializer/doc/handlers.rst
	vendor/jms/serializer/doc/reference.rst
	vendor/jms/serializer/doc/reference/annotations.rst
	vendor/jms/serializer/doc/reference/xml_reference.rst
	vendor/jms/serializer/doc/usage.rst
	vendor/jms/serializer/phpunit.xml.dist
	vendor/jms/serializer/tests/bootstrap.php
	vendor/phpcollection/phpcollection/doc/LICENSE