Simplified Configuration.php
Merge branch 'rename-mappings' into configuration-tidy
Bring tidy in line with property renaming
Deprecate top level classes
Configuration rework
Merge remote-tracking branch 'origin/refactor' into typed-config

Conflicts:
	Resetter.php
Move Search annotation
Update composer.json
Fix previous commits
Config Source providers
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
Rename Manager to ConfigManager
Cache creation of indexes and types in Elastica to avoid recreation
Move IndexManager's resolution to tagged index services
Fixed mapping issues
Fix serializer
Fix undefined index_name notice
Merge branch 'typed-config'

Conflicts:
	composer.json
Fix AbstractProvider test