[ADLM] maj bo
Merge branch 'master' of https://github.com/PersonalProjectSource/BackOfficeCustom

Conflicts:
	src/App/ECommerceBundle/Entity/Customer.php