Merge pull request #392 from CruGlobal/MH-1043

Use s3 of uploading people avatar
Migration to remove duplicate predefined questions, Fix possible duplicate process of questions
Fix conflicts after merging MH-1041 to dev