Added js files
Merge branch 'develop-v.2' into v.2