merge master
fixing merge
user newsfeed view