Removed friend list socket updating for the time being
Fix merge conflict in app.js