Merge branch 'dev'

Close security hole in survey by using current user's credentials