change js variabel
Merge branch 'master' into sep04-01