Reworked contact related entities
Merge remote-tracking branch 'zjoia_master/master'

Conflicts:
	src/Wun/Orchid/ApiBundle/Entity/Member.php