split survey screen
resolved conflict
Merge https://github.com/indaso/CAPSProject
merged with Tony
modified survey
deleted OldSurvey
resolve conflict