Web Services upgrade

Most of the changes are related to tab/spaces conversion; other relevant changes are related to Maven configuration