Merge branch 'master' of https://github.com/romsearcher/tallerExtensiones

Conflicts:
	sportclub.web/src/main/webapp/src/controller/championShipController.js
Commit Final del preparcial

Requerimientos Completos:
2,4,6,8.