Merge branch 'develop'
Removed comments in manifest.json.
Merge branch 'develop'