add marriage in edit profile page.
Merge branch 'master' of https://github.com/qianchi/docare.net