Improve calculated attributes handling
Merge branch 'master' of https://github.com/openforis/collect

Conflicts:
	pom.xml