merge from mapjs and upload scripts