Wishlist, falta listar y crear correctamente
Merge branch 'master' of https://github.com/minzaurralde/ol4rent

Conflicts:
	OL4RENT/OL4RENT.csproj
	Ol4RentAPI/Ol4RentAPI.csproj
Merge branch 'master' of https://github.com/minzaurralde/ol4rent