Fix activity stream links
Merge branch 'feature/angular' of codebasehq.com:playgen/celar/datacon into feature/angular