Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
set js indentation level in both jsmode and js2mode.