fixed javascript bug
Merge branch 'fix-progress-bug'