Merge feature/mention-button into feature/activity-filter
Fixbug loadmore by merging master into activity-filter