Cambios César
Merge branch 'master' of https://github.com/FICECode/SmashProject

Conflicts:
	application/views/Facturas/index.php