Merge pull request #249 from CruGlobal/MH-807

Fix error in Production add group member in survey responses
Add faculty (bridge only) and nationality as predefined questions
Make the faculty and nationality predefined
Fix merging conflicts