import Rol
historial adaptado a item, abm item, tipo de items
Se trajo la ultima version, y se agregaron más test
commit atributos
Mas test, Correcciones en Asignaciones.
Eliminar miembro del comite
Merge branch 'adolfo'

Conflicts:
	GPMmodulos/manage.py
	GPMmodulos/webapp/modelos/__init__.py
	GPMmodulos/webapp/modelos/models_adm.py
	GPMmodulos/webapp/templates/admin/rolesxusuario.html
	GPMmodulos/webapp/templates/admin/tiposItemxproyecto.html
	GPMmodulos/webapp/vistas/forms_adm.py
	GPMmodulos/webapp/vistas/views_adm.py
Penúltima versión para iteración 5

Conflicts:
	GPMmodulos/tests/__init__.pyc
	GPMmodulos/tests/test_models.py
	GPMmodulos/tests/test_models.pyc
	GPMmodulos/tests/test_utils.pyc
	GPMmodulos/tests/test_views.pyc
	GPMmodulos/webapp/templates/admin/rolesxusuario.html
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
ultimo commit
Administracion Linea Base
Merge remote-tracking branch 'origin/master' into pable

Conflicts:
	GPMmodulos/tests/__init__.pyc
	GPMmodulos/tests/test_models.pyc
	GPMmodulos/tests/test_utils.pyc
	GPMmodulos/tests/test_views.pyc
	GPMmodulos/webapp/modelos/__init__.py
	GPMmodulos/webapp/modelos/models_adm.py
	GPMmodulos/webapp/vistas/forms_adm.py
	GPMmodulos/webapp/vistas/views_adm.py
cambio general
Merge remote-tracking branch 'origin/master' into adolfo
commit para 6ta iteracion
Merge remote-tracking branch 'origin/master' into adolfo

Conflicts:
	GPMmodulos/webapp/templates/index/indexUser.html
	GPMmodulos/webapp/vistas/views_adm.py