updates
test almost read
merge with steven
Merge branch 'features/RH/SW-updateactivity' of github.com:ucberkeley/moocchat into features/RH/SW-updateactivity