Search Users Table Working
following followers working
Merge branch 'chris-dev' into rich-dev
fixes merge conflict