Added converter beans.
Orphaned terms are removed from parent concept.
Orphaned terms are removed from parent concept.
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
	src/main/java/se/termweb/spring/services/impl/ConceptServiceImpl.java
	src/test/java/se/termweb/spring/services/impl/ConceptServiceImplTest.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/se/termweb/spring/domain/Concept.java
Update unit test for the concept service.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/se/termweb/spring/services/impl/ConceptServiceImplTest.java
	src/test/resources/se/termweb/spring/services/impl/conceptServiceImplTest/testUpdateConcept.expected.xml
	src/test/resources/se/termweb/spring/services/impl/conceptServiceImplTest/testUpdateConcept.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Small fixes in configuration.