Add manifest file
Manifest changes
Merge branch 'develop'
Merge branch 'master' into release