Added Activity and Rubric functionality
Merge pull request #140 from firethanatos/master

Added Activity and Rubric functionality