fixes
Merge branch 'newsurveys' of github.com:Orasi/onTap into newsurveys
updated past method
test
merge survey