Merge pull request #13 from dapanas/master

Funcionalidad nueva
cambios admin
Merge branch 'master' of https://github.com/PhpNinja/magma-web