new Manifest
Updates
Merge branch 'master' into design