Pendientes locales
Merge branch 'master' of https://github.com/GregoXYZ/caronte

Conflicts:
	WebContent/WEB-INF/main/mainView.jsp