list activities
get activities by category
Merge remote-tracking branch 'origin/master'