Merge branch 'stagging'
fixbug when compress js
Merge branch 'fix_bugs_from_aminh'