Merge branch 't5_edit_contact'
Merge branch 't5_edit_contact'
ticket:4
merge conflicts fixed
Merge branch 'master' into t5_edit_contact
ticket:1 add deploy edit