Extra info in sampling design table
Sampling design import including extra info columns
Convert filter attributes according to sampling points attributes
Merge branch 'master' of https://github.com/openforis/collect into
extrainfoinsamplingdesign

Conflicts:
	pom.xml
Code clean, introduce abstract DatabaseLookupProvider
Handle expression missing values as null values
Layout adjustments