merge con alvaro.
mitad de rutas absolutas puestas
Merge branch 'develop' of https://github.com/sharedslist/sharedslist.git
into develop

Conflicts:
	src2/index.html
Merge branch 'develop' of https://github.com/sharedslist/sharedslist.git into develop