update in batch and sloved issue of java script.
CHANGES
Merge remote branch 'upstream/master'
changes