Merge pull request #22 from ibarroladt/Javier2

merged surveys controllers
deleted results controller beacuse the code was duplicated