ticket:3 fix
ticket:3 Merge branch 't2_contacts'
ticket:3 fix
master Merge branch 't3_edit_contact'