added jQuery search through followed users
fixed merge conflict in user partial