Eliminado index.php~
Merge branch 'master' into Facu