add XML support
resolve merge conflicts
add default cache-control header