Update expansion factor task
Merge branch 'dev' of github.com:openforis/calc into dev

Conflicts:
	calc-core/src/it/java/org/openforis/calc/chain/pre/PrepareOutputSchemaTest.java