ticket:5 html validator happy
Merge branch 't5_edit_contact'