Added support for initializing objects with both 'type' and 'className' properties.
Merge branch 'master' into dev-webservice
Fixed class name in type initializer.
Fixed the web service matcher SSL matching.