Merge "Added Contact-Us Component and Service"