Added form for edit survey
fixed the edit view of survey
merging
Merge pull request #5 from oconn/alex

Alex stuff