Added addresses and notes to contacts
Merge origin/master