modified:   app/controllers/MapasController.php
	modified:   app/controllers/ReportesController.php
	modified:   app/models/Login.php
	modified:   app/routes.php
	modified:   app/views/reportes/procesos.blade.php
	modified:   public/images/example.drawIndicator.png
	modified:   public/js/combosAnidados.js
Merge branch 'master' of https://github.com/santymoreira/sgc

g
Merge branch 'master' of https://github.com/santymoreira/sgc

l
Merge branch 'master' of https://github.com/santymoreira/sgc

mapas bsc
Merge branch 'master' of https://github.com/santymoreira/sgc

l
Merge branch 'master' of https://github.com/santymoreira/sgc
Merge branch 'master' of https://github.com/santymoreira/sgc
Merge branch 'master' of https://github.com/santymoreira/sgc