add ecmascript-mode
Merge branch 'master' into mac
fix font settings
merge with master
small changes in settings
merge with mac branch