Merge "Added docu headers to content(handler) files"