Updated friend list generator
Merge changes from server into tommy