View activity info by date
Merge branch 'master' of https://github.com/Xcelsziore/MASProject

Conflicts: