survey removed mocked and added error toasts
Merge branch 'develop' of github.com:izzappel/boom into develop