Support incremental import with import (OPAL-1604)
Support incremental import with unit (OPAL-1604)
Merge branch 'master' into feature-unit-incremental-import

Conflicts:
	opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/wizard/importdata/presenter/UnitSelectionStepPresenter.java
Extract IdentifierService
Rename ImportData to ImportConfig
Use magma-1.5-SNAPSHOT
Add assertions
Add AbstractDatasourceWrapperWithCachedTables
Upgrade Guava to 14.0
Don't wrap FunctionalUnitView inside another FunctionalUnitView
Use FluentIterables
Work on unit & incremental import (OPAL-1604)
Fix PMD warnings
Fix OPAL-1685: Data import: don't allow to choose Unit with non Participant entities
Merge branch 'master' of github.com:obiba/opal

Conflicts:
	opal-core-api/src/main/java/org/obiba/opal/core/unit/FunctionalUnit.java
	opal-core-ws/src/main/java/org/obiba/opal/web/security/AuthorizationInterceptor.java
	opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/util/DatasourceDtos.java
	opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/wizard/importdata/ImportFormat.java
Merge branch 'master' of github.com:obiba/opal

Conflicts:
	opal-core-api/src/main/java/org/obiba/opal/core/unit/FunctionalUnit.java
	opal-core-ws/src/main/java/org/obiba/opal/web/security/AuthorizationInterceptor.java
	opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/util/DatasourceDtos.java
	opal-gwt-client/src/main/java/org/obiba/opal/web/gwt/app/client/wizard/importdata/ImportFormat.java