activity -> activity_feed, Activity -> ActivityFeed
Merge remote-tracking branch 'origin/master'
move connection