adding list view for activities
merge with 'master'