updating content, header, and activities
Merge branch 'master' into gh-pages