Cambios en partido
Merge branch 'master' into adri

Conflicts:
	application/controllers/partido.php