Creación de roles
Merge remote-tracking branch 'origin/master'

Conflicts:
	vista/web/js/custom-admin.js
Merge branch 'master' of github.com:sergiorosx/ProyectoWeb