set maxSockets and fix around timeout
merge conflicts and fix some js styles
add carton files/dirs