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
tidy up
Merge branch 'Enterprise_Pilot_1.0' into LiamConcurrencyfix