ran through lint, updated manifest
updated changes and description
Merge branch 'release/v2.0' into develop