Merge pull request #127 from SmokyBob/feature/material_design

Fix to issue 126
activity Types in the Activity table
Merge pull request #129 from SmokyBob/issue125

activity Types in the Activity table (#125)