fix app script root from 'app' to 'js'
Merge remote-tracking branch 'origin/master'