a

b
Merge branch 'master' of https://github.com/flejoss/VieilleSardine

Conflicts:
	src/VieilleSardine/CommandeBundle/Resources/config/routing.yml