Renamed friendList functions to more general set functions in complib.js
Fixing merge conflict