RodrigoCamposWZNT_0.2
RodrigoCamposWZNT_0.2
Merge branch 'master' of https://github.com/pgemeo/WZNT

Conflicts:
	Services/DbManagerSet/DbManagerGruFarbtyp.cs
	Services/Service References/WZNTServices/Reference.cs
	Services/Service References/WZNTServices/Service1.wsdl
	Services/Service References/WZNTServices/Service1.xsd
	UI/Controls/UcGruArtFarbtyp.cs
	UI/Workspaces/WsGruArtFarbtyp.cs