initial merge with mapjs newcanvas
updated mapjs
uploaded scripts