fix a regression in survey controller
#113 more work on reviewer feedback
Merge branch 'refactor' of github.com:geosolutions-it/fra2015 into refactor