Use latest version of collect-core, support upload .collect files
Merge branch 'master' of https://github.com/openforis/calc