Add activity type, modify badge types.
Merge pull request #124 from mozilla/116-update-data-fields

Add activity type, modify badge types.