added form fields to edit profile page.
Merge branch 'gabe'
fix merge conflicts