register vith device
email settings fixed
menu fixes, added images to contacts
menu fixes, added images to contacts
fix merge with register conflicts
fix merging conflicts