Resolved merge conflicts
Resolved merge conflicts
working dinamic survey creator