Handle multiple formulas for calculated attribute
Merge branch 'master' of https://github.com/openforis/collect