Merge pull request #1 from claytical/master

Getting new files
Merge pull request #2 from claytical/master

fix
Activity Page
Merge pull request #3 from lbtran/master

activity pages