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