update to allow custom activty stream.
Merge remote-tracking branch 'origin/socialintegration' into socialintegration