changes to the activity stream to allow facebook profile pictures
Merge remote-tracking branch 'origin/socialintegration' into socialintegration