Merge branch 'master' of github.com:openforis/collect into jooq3

Conflicts:
	collect-core/src/main/java/org/openforis/collect/manager/RecordManager.java
	collect-rdb/src/main/java/org/openforis/collect/relational/data/CodeTableDataExtractor.java
	collect-rdb/src/main/java/org/openforis/collect/relational/jooq/JooqDatabaseExporter.java
	collect-rdb/src/main/java/org/openforis/collect/relational/model/RelationalSchema.java
	collect-server/src/main/java/org/openforis/collect/designer/viewmodel/SurveyExportParametersVM.java
	collect-server/src/main/java/org/openforis/collect/designer/viewmodel/SurveySelectVM.java
	collect-web/collect-webapp/src/main/webapp/WEB-INF/labels/designer/label_en.properties
	collect-web/collect-webapp/src/main/webapp/WEB-INF/view/zul/designer/component/survey_export_parameters_popup.zul
Resolved conflicts merging jooq3 branch