js beautify, tag support, small changes in mapping
merge