add handling for friend on multiple SNs
handling for multiple SNs and inclusion of homelocation for oush to
context and remove addactivity for create css record
resolve merge conflicts in css manager
Fixed bug where names not appearing for cis members
commented out RFID driver bundle from device mgmt plan
Fixed bug for people with less the 100 friends
Merge branch 'Enterprise_Pilot_1.0' of https://github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
tidy up
Merge branch 'Enterprise_Pilot_1.0' into LiamConcurrencyfix
Fix: Twitter prefix to Friends and Profile id
Merge branch 'Enterprise_Pilot_1.0' of https://github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
Added "about" info
Merge branch 'Enterprise_Pilot_1.0' of https://aleckey@github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0
Merge branch 'Enterprise_Pilot_1.0' into VCard_alec