Email now takes the first email with an @ symbol.

merge with geonetwork develop...