Edited activite view
Merge pull request #8 from jskudlarski/master

Merged