move didchange up
Merge pull request #1246 from onepercentclub/feature/move-did-change

move didchange up
do not load a controller on the modal if the same controller is loaded on the other side
Merge remote-tracking branch 'upstream/feature/CLUB-1222' into feature/fix-mock-thank-you