add media in newsfeed and refactor
Merge branch 'develop'