Add users feed, user relationships, update routes, views, tests and more
Merge conflict in users_controller