Fully merged. Added FriendsList and MapsFragment(still non working)