two spaces indentation for javascript
Merge remote-tracking branch 'origin/master'