82075590 Update survey model accoring to provided template
Updated survey model, added requested survey components.
Fixed User index problem.