Merge branch 'dev'
javascript cleanup