Merge branch 'dev' of github.com:openforis/calc into dev
CALC-58 - Add originalId to Category

Use simple jdbc instead of Jooq in CategoryDao
CALC-60 - Add "dimensionTable" field to Variable and populate on import
Merge branch 'dev' of github.com:riccist/calc into dev

Conflicts:
	calc-core/src/it/java/org/openforis/calc/collect/CollectMetadataServiceIntegrationTest.java
	calc-core/src/main/java/org/openforis/calc/collect/SyncMetadataTask.java
	calc-core/src/main/java/org/openforis/calc/metadata/Category.java
	calc-core/src/main/java/org/openforis/calc/metadata/Variable.java
	calc-core/src/main/java/org/openforis/calc/persistence/CategoryDao.java