Repository initialization
Repository initialization
Repository initialization
Merge remote-tracking branch 'origin/master'

Conflicts:
	rema-camel/pom.xml
	rema-camel/src/main/java/com/hibu/rema/camel/aggregationstrategy/PopulateStructureReferencesAggregationStrategy.java
	rema-camel/src/main/java/com/hibu/rema/camel/routebuilder/DelegateRouteBuilder.java
	rema-camel/src/main/java/com/hibu/rema/camel/routebuilder/MetacontentDAORouteBuilder.java
	rema-camel/src/main/java/com/hibu/rema/camel/routebuilder/PersistenceCSDAORouteBuilder.java
	rema-camel/src/main/java/com/hibu/rema/camel/routebuilder/REMADAORouteBuilder.java
	rema-camel/src/main/java/com/hibu/rema/camel/routebuilder/StructureRouteBuilder.java
	rema-camel/src/main/java/com/hibu/rema/camel/typeconverter/MetacontentConverter.java
	rema-camel/src/main/java/com/hibu/rema/camel/typeconverter/REMAConverter.java
	rema-camel/src/main/resources/META-INF/spring/rema-camel-config.xml
	rema-camel/src/main/resources/config/endpoints-config.properties
	rema-parent/pom.xml
	rema-ws/src/main/resources/META-INF/wsdl/rema/rema.wsdl
	rema-ws/src/main/resources/META-INF/wsdl/rema/rema.xsd
	rema-ws/src/main/resources/config/rema-ws-config.properties
Repository initialization