Nuevo
Merge branch 'master' of https://github.com/ecorona/37310765

Conflicts:
	.gitignore
	application/config/database.php
	application/config/facturacion.php
	application/controllers/admin.php
	application/views/common/menu.php
	assets/qrs/A1.png
	assets/qrs/A2.png
	assets/qrs/XX.png
	src/sql.sql