Cleaned WebService, fixed small issues
Merge origin/master