changes for activity feed template + implementation of popup
Merge remote-tracking branch 'upstream/master'