Merge origin/master

Conflicts:
	src/ipezbo/CustomerBundle/Resources/views/Customer/index.html.twig
Merge origin/master

Conflicts:
	src/ipezbo/CustomerBundle/Resources/views/Customer/index.html.twig