revolved some conflicts
Merge remote-tracking branch 'origin/master'
Main static class to test webservice