Fixed js paths
Merge branch 'Refactoring' into develop