eventosmodel
Merge branch 'master' of https://github.com/PhpNinja/magma-web

Conflicts:
	models/eventosModel.php