add beautify for -debug.js
resolve conflict
Merge branch 'beautify'