Partial checkin for activity report story
Merge pull request #307 from pfschwartz/develop

Partial checkin for activity report story