Consider calculated attribute as a regular attribute plus "calculated"
option
Merge branch 'master' of https://github.com/openforis/collect into
extrainfoinsamplingdesign

Conflicts:
	pom.xml