Commit deprueba
Merge branch 'master' of https://github.com/blackymetal/MeImportaBogota

Conflicts:
	web/app/View/Reports/admin_index.ctp