manifest.json added to project ...
Merge branch 'develop'