fixed merge issue
newsfeed updated not complete yet
Merge branch 'bandell-branch'