Use one assembly
Merge from master
Add System.Web.Services
Fix addin-project.xml