Merge branch 'master' into blade-runner
Merge branch 'eclipse' into blade-runner
BUGFIX: Ya se pueden volver a añadir consumos de bigbag a partes de fibra embolsada.
FAIL enorme en test de regresión. Volviendo a versión de ayer.
Merge branch 'blade-runner' of github.com:pacoqueen/ginn into blade-runner
Merge branch 'master' into blade-runner

This reverts commit 464f9c2bfb1a88bc5242e5a1355e4eaa50104ba9.

Conflicts:

	framework/pclases.py
Merge branch 'master' into blade-runner
EPIC FAIL! Regression.
Merge branch 'blade-runner' of github.com:pacoqueen/ginn into blade-runner
Actualización biblioteca gmail.