updated survey questions based on berkeley changes
Merge branch 'master' of https://github.com/SCCWRP/SHS2