Merge pull request #346 from CruGlobal/MH-986

Check email answer in survey question has attribute email to avoid dupli...
Refactor organization menu
Adjust test
Merge branch 'MH-988' into dev