Removed final
Merge remote-tracking branch 'upstream/dev' into dev
Preprocess DB
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	calc-core/src/main/java/org/openforis/calc/engine/CalculationStep.java
Added missing classes
merge (work in progress)
merge (work in progress)
merge (work in progress)
Merge pull request #5 from sanchezpaus/dev

Dev