Wish
Merge branch 'master' of https://github.com/minzaurralde/ol4rent

Conflicts:
	Ol4RentAPI/DTO/AutoMapperUtils.cs
	Ol4RentAPI/Model/Model.edmx.sql
Alta de Bien
Alta Bien
Edit wish
Merge branch 'master' of https://github.com/minzaurralde/ol4rent

Conflicts:
	Ol4RentAPI/Model/Model.Designer.cs
	Ol4RentAPI/Model/Model.edmx.sql
Merge branch 'master' of https://github.com/minzaurralde/ol4rent.git
Merge con el chat de Jonathan