add user following
merge
Merge branch 'following-users'