ouh ! plus de plantage...   heureusement que j'ai fait une copie à part ...sinon github a tout ecrasé mon travail.

Merge origin/master

Conflicts:
	src/Next/AddressBookBundle/Entity/Societe.php
	src/Next/AddressBookBundle/Form/ContactForm.php
	src/Next/AddressBookBundle/Repository/ContactRepository.php
	src/Next/AddressBookBundle/Resources/views/Contact/ajouter.html.twig
	src/Next/AddressBookBundle/Resources/views/menu.html.twig