Merge pull request #27 from dejan-brkic/russ_master

Activity Service refactoring Merging 3 activity service classes into 1
Merge branch 'master' of github.com:russdanner/studio2 into russ_master