va el modelo
Merge branch 'master' of https://github.com/minzaurralde/ol4rent
Merge branch 'master' of https://github.com/minzaurralde/ol4rent
Membership
Merge branch 'master' of https://github.com/minzaurralde/ol4rent

Conflicts:
	OL4RENT/OL4RENT.csproj
	OL4RENT/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache