added some code to buddylist
merged files