SQUASH THIS: Update friend list when callbacks are received, java code
SQUASH THIS: Update friendlist on callbacks, C code
Refactoring.
Merge branch 'upstream/friendapi'