ABM FASE 2
Mas commit de init
ABM Roles
ABM Permisos
ABM Permiso V2
Asignar permisos
Mas commit
Mas commit
Mas commit
Botones de ruth
Merge branch 'Postgre'

Conflicts:
	microblog/app/__init__.py
	microblog/app/__init__.pyc
	microblog/app/controlador/__init__.pyc
	microblog/app/controlador/contUsr.pyc
	microblog/app/forms.pyc
	microblog/app/modelo/__init__.pyc
	microblog/app/modelo/fase.pyc
	microblog/app/modelo/proyecto.pyc
	microblog/app/modelo/usuario.pyc
	microblog/app/views.pyc
	microblog/app/vista/__init__.pyc
	microblog/app/vista/vistaFase.pyc
	microblog/app/vista/vistaProyecto.pyc
	microblog/app/vista/vistaUsuario.pyc
	microblog/config.py
	microblog/config.pyc
Arreglando conflicto
Commit en master