Updated to lasted JSONPageBuilder
Fixed merge conflict for lastest udpate