replace Bundle services.xml with services.yml and format according to Symfony Bundle guidelines
Merge remote-tracking branch 'origin/master'

Conflicts:
	Resources/config/services.yml