bugfix:js not compiling in production mode
Merge remote-tracking branch 'origin/master'