Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'

Conflicts:
	composer.json
updated composer.json
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'
Merge branch 'sonata/master'

Conflicts:
	Resources/doc/reference/advance.rst
Merge branch 'sonata/master'
Merge branch 'sonata/master'