mike modding FriendsList.java
Merge remote-tracking branch 'upstream/master'