Change choose_people shuffle btns
Merge branch 'master' into HEAD