Update documentation to deal with the change where  become
Fix CS
Merge branch '2.0'

Conflicts:
	Resources/doc/configuration.md
	Tests/Fixtures/config/yaml/multiple_configuration.yml
	Tests/Fixtures/config/yaml/single_configuration.yml
	Tests/Form/Type/CKEditorTypeTest.php