Avtivities subscribe feed logic improvement
Merge conflict dashboard controller
Merge branch 'master' of https://github.com/repo-edel/Super-Edel-2007