Added auto redirect after survey, fixed questions counter
Fixed merge