UnIgnored Schema.yml committing changes.
UnIgnored Schema.yml committing changes.
Merge origin/master

Conflicts:
	config/doctrine/schema.yml
Merge origin/master

Conflicts:
	config/doctrine/schema.yml