fixed merge conflict on js file
Merge branch 'master', remote-tracking branch 'origin' into gh-pages