Update to add activities
Merge branch 'master' of https://github.com/grabbeh/fennec