Merge branch 'master' into next_version

web_service/ws/Categories.class.inc

web_service/ws/Category.class.inc

web_service/ws/EmailContext.class.inc

web_service/ws/EmailContexts.class.inc

web_service/ws/EmailOption.class.inc

web_service/ws/EmailOptions.class.inc

web_service/ws/EmailTemplate.class.inc

web_service/ws/EmailTemplates.class.inc

web_service/ws/FmeEngine.class.inc

web_service/ws/FmeEngineType.class.inc

web_service/ws/FmeEngineTypes.class.inc

web_service/ws/FmeEngines.class.inc

web_service/ws/Gtf.class.inc

web_service/ws/GtfEngine.class.inc

web_service/ws/GtfEngines.class.inc

web_service/ws/GtfGroup.class.inc

web_service/ws/GtfGroups.class.inc

web_service/ws/Inbox.class.inc

web_service/ws/Inboxes.class.inc

web_service/ws/Instance.class.inc