Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml
	Controller/Configuration.php
	Controller/ParametersParser.php
	Controller/ResourceController.php
	Controller/ResourceResolver.php
	DependencyInjection/Compiler/ResolveDoctrineTargetEntitiesPass.php
	DependencyInjection/Configuration.php
	DependencyInjection/DoctrineTargetEntitiesResolver.php
	DependencyInjection/SyliusResourceExtension.php
	Doctrine/ODM/MongoDB/DocumentRepository.php
	Doctrine/ORM/EntityRepository.php
	README.md
	SyliusResourceBundle.php
	composer.json
	spec/Sylius/Bundle/ResourceBundle/Controller/ConfigurationSpec.php
	spec/Sylius/Bundle/ResourceBundle/Controller/ResourceControllerSpec.php
	spec/Sylius/Bundle/ResourceBundle/Controller/ResourceResolverSpec.php
	spec/Sylius/Bundle/ResourceBundle/DependencyInjection/Compiler/ResolveDoctrineTargetEntitiesPassSpec.php
	spec/Sylius/Bundle/ResourceBundle/DependencyInjection/DoctrineTargetEntitiesResolverSpec.php
	spec/Sylius/Bundle/ResourceBundle/Doctrine/ODM/MongoDB/DocumentRepositorySpec.php
	spec/Sylius/Bundle/ResourceBundle/Doctrine/ORM/EntityRepositorySpec.php
	spec/Sylius/Bundle/ResourceBundle/Fixture/Entity/FooInterface.php
	spec/Sylius/Bundle/ResourceBundle/SyliusResourceBundleSpec.php