Js dom

js dom merge into master