Web service binding
Merge remote-tracking branch 'origin/master'

Conflicts:
	alfresco/alfresco.iws
Alfresco