start changes
Merge remote-tracking branch 'origin/master'
ui changes
Merge remote-tracking branch 'origin/master'
a
UI Fixes + changed buddy list view controller