cambios generales
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.1
reportes
config
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.1

Conflicts:
	app/Controller/ContributorsController.php