Commit Base datos
Merge remote-tracking branch 'origin/master' into Alberto

Conflicts:

	appBusetas/appBusetas/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge remote-tracking branch 'origin/master' into Alberto
Update config
update2
update3
Styles maintenance