Cambios varios -permisos
import Rol
interprete
union Adolfo Fran
prueba de tabla
interprete
Merge branch 'master' into fran
Merge remote-tracking branch 'origin/master' into adolfo

Conflicts:
	GPMmodulos/webapp/modelos/__init__.py
	GPMmodulos/webapp/modelos/models_adm.py
	GPMmodulos/webapp/templates/admin/rolesxusuario.html
	GPMmodulos/webapp/vistas/forms_adm.py
	GPMmodulos/webapp/vistas/views_adm.py
traido de arriba
mmm
Nuevo
Nuevo2
Merge remote-tracking branch 'origin/master' into adolfo
Merge remote-tracking branch 'origin/master' into adolfo

Conflicts:
	GPMmodulos/webapp/templates/index/indexUser.html
	GPMmodulos/webapp/vistas/views_adm.py
Merge branch 'adolfo' into fran
ultimus
the last version and .gitignore