Spring dependency removal
fixed issue with Logger
fixed issue
Removed conflicting spring version
Added property files in GUI
Added new fields
Added new fields
Parameterized client
Added change
Removed conflicting dependency inherited from corelib
Merge origin/master
Fixing issue with the Agent enrichments
Fixed GUI properties file
Fixed GUI properties file
Merge origin/master

Conflicts:
	europeana-enrichment-framework/enrichment/enrichment-framework-knowledgebase/src/main/java/eu/europeana/enrichment/controlledsource/api/internal/AgentMap.java
	europeana-enrichment-framework/enrichment/enrichment-framework-knowledgebase/src/main/java/eu/europeana/enrichment/controlledsource/util/DataManager.java
Updated artifactory, removed surplus dependency
Merge branch 'master' of https://github.com/europeana/tools

Conflicts:
	europeana-enrichment-framework/enrichment/enrichment-framework-knowledgebase/src/main/java/eu/europeana/enrichment/controlledsource/util/DataManager.java