Fixed indention in js file
Merge remote-tracking branch 'origin' into release