Merge branch 'release-2.0' into develop
Add tests
Merge branch 'tests' into develop
Remove broken JS
Merge branch 'develop'