fixed a bug and added survey service mock
Merge branch 'develop' of github.com:izzappel/boom into develop
Merge branch 'develop' of github.com:izzappel/boom into develop