Feature/cur 4158 develop pull to resolve conflict#1345

AqibYounasAtTkxel wants to merge 20 commits intofeature/CUR-4133-indp-act-architecture-change-parent-branchActiveLearningStudio/ActiveLearningStudio-API:feature/CUR-4133-indp-act-architecture-change-parent-branchfrom

feature/CUR-4158-develop-pull-to-resolve-conflictActiveLearningStudio/ActiveLearningStudio-API:feature/CUR-4158-develop-pull-to-resolve-conflictCopy head branch name to clipboard