Add user following
Merge branch 'dev'