elimino web service ws_master
Merge remote-tracking branch 'origin/master'