merge
Merge branch 'master' of https://github.com/maritomunoz/singapur

Conflicts:
	web/descargaVisitaEscuela.php