rails31 branch: fix and make consistent display of activities
rails31 branch: fix and make consistent display of activities

lazzarello/bk-tb-remote,lazzarello/bk-tb-remote,cgorringe/oscurrency,cgorringe/oscurrency,cgorringe/oscurrency