finished accordion style for activities
Merge branch 'master' into gh-pages