improves survey admin
Merge branch 'dev'