Merge master>deploy & build js