Alignment
Fix VCardTest test
Fix vcard test
Fix RosterTest test
RosterTest tests working
Prevent deletion of vcards that are used in roster maps