Simplified Configuration.php
Merge branch 'rename-mappings' into configuration-tidy
Bring tidy in line with property renaming
Deprecate top level classes
use $this->container instead of $container
Configuration rework
Make the class of fos_elastica.paginator.subscriber service configurable
Merge remote-tracking branch 'origin/refactor' into typed-config

Conflicts:
	Resetter.php
Move Search annotation
Update composer.json
Fix previous commits
Config Source providers
Added aggregations methods to paginator
Update composer.json
Merge pull request #613 from merk/composer-update

Update composer.json
Merge branch 'master' into typed-config

Conflicts:
	CHANGELOG-3.0.md
	Client.php
	DependencyInjection/Configuration.php
	DependencyInjection/FOSElasticaExtension.php
	DynamicIndex.php
	Resources/config/config.xml
	Resources/config/mongodb.xml
	Resources/config/orm.xml
	Tests/DependencyInjection/ConfigurationTest.php
	composer.json
dev
Merge pull request #600 from gido/patch-1

Make the class of `fos_elastica.paginator.subscriber` service configurable
Merge pull request #591 from OskarStark/patch-1

use $this->container instead of $container in usage.md
Rename Manager to ConfigManager