Fix bug people subscribe
Commit people
Commit confict
Merge branch 'master' of https://github.com/repo-edel/Super-Edel-2007