consolidate non WoW friends and add HotS