re-factored 'activity' WS and React modules to handle a normalized stream of activity instead of separate streams for each type of activity