Cambios ooh4ria
Merge branch 'develop' of https://github.com/pablovargan/winforms-ooh4ria into develop

Conflicts:

	PalmeralGenNHibernate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache