Fixed a bug with activities
Merge branch 'master' into gh-pages