Merge branch 'release/1.0.0'
Merge branch 'release/1.1.0'
Fix javascript bug
Merge branch 'hotfix/javascript_bug' into develop