Correcciones language
cambios admin
cambios admin++
cambio api eventos/category
Merge branch 'master' of https://github.com/PhpNinja/magma-web

Conflicts:
	language/cat.php
	language/esp.php