dev update
modify ie browser error, js problem
merge dev to master