Desarrollo
Merge branch 'master' of https://github.com/sclMAX/IndumaticsGestion

Conflicts:
	clientconfig.db4o
	nbproject/private/private.xml
	src/indumaticsgestion/IndumaticsGestion.java
	src/indumaticsgestion/data/comun/ClientConfigProvider.java
	src/indumaticsgestion/data/comun/DataBase.java
	src/indumaticsgestion/guis/comun/dlgClientConfig.form
	src/indumaticsgestion/guis/comun/dlgClientConfig.java
	src/indumaticsgestion/recursos/strings.properties
	src/indumaticsgestion/servidor/clases/ServerConfigProvider.java
	src/indumaticsgestion/servidor/clases/Servidor.java
	src/indumaticsgestion/servidor/guis/ServidorMain.java
	svrconfig.db4o