Add custom labels for survey questions and custom element labels management using the super admin screen
Fix conflicts after merging MH-981 to dev