merged surveys controllers
Merge pull request #22 from ibarroladt/Javier2

merged surveys controllers