plot aggregates work in progress
Merge branch 'master' of github.com:openforis/calc

Conflicts:
	calc-core/src/main/java/org/openforis/calc/engine/CalcJob.java
	calc-core/src/main/java/org/openforis/calc/r/RScript.java
plot aggregates work in progress
Merge branch 'master' of github.com:openforis/calc