Calculation step edit
Merge branch 'dev' of github.com:openforis/calc into dev

Conflicts:
	calc-webapp/src/main/webapp/step-edit.html
Merge branch 'dev' of github.com:openforis/calc into dev

Conflicts:
	calc-webapp/src/main/webapp/step-edit.html