activity feed& fixed nav bar
Merge branch 'activity_feed'