Merge branch 'hotfix-1.0.1'
Be sure there are none dublicates.
Use correct js dir.
Merge branch 'hotfix-1.0.2' into develop