fixed js issue
update ignore
update ignore
Merge branch 'mod1'
merged