Solve a merge of websservices
Merge pull request #14 from FraGoTe/dev

Solve a merge of webservices