Renamed activity types
Merge branch 'master' of https://github.com/sidazhang/pavlov