Added webservice classes
Resolved conflicts