ticket:5 getbarista migration fix
Merge branch 't5_edit_contact'