add a few needed things..
Merge remote-tracking branch 'origin/master'
Fix problem with sending survey object on back-end