Fix paths in manifest file
Merge branch 'master' into feature/140-activities