CALC-177 - save calculation step
Code clean
Merge branch 'dev' of github.com:openforis/calc into dev