Merge branch 'hotfix/2.0.1' into develop
renamed manifest file
updated version to 2.0.2 for manifest
Merge branch 'release/2.0.2'