Merge con push de David

Conflicts:
proveedor.web/nb-configuration.xml
Merge branch 'master' of https://github.com/f94f/SWF

Conflicts:
	proveedor.web/nb-configuration.xml
Arreglo del nb-config
Arreglo del nb-config
Merge branch 'master' of https://github.com/f94f/SWF