change minor things
Merge branch 'master', remote branch 'origin/edit-contact'