Use latest idm version
Merge branch 'master' of github.com:openforis/collect

Conflicts:
	pom.xml