Merge pull request #85 from snordt/master

moved active content to data repo, changes to timeline and other file cl...
new DCAPS document from Dave
rollback on timeline