Merge pull request #512 from NicoleRauch/master

Removed special activity coloring and added display of activity creator.