* Test commit
* 1.0.4 release (Measure service updated, norwegian language fix and several bug fixes)
* 1.0.5-SNAPSHOT
* Specify compiler version (1.6) at pom
* xmlbeans-maven plugin version fix
* javax.measure relocation fix
Merge branch 'master' of https://github.com/openEHR/java-libs

Conflicts:
	adl-parser/pom.xml
	adl-serializer/pom.xml
	dadl-binding/pom.xml
	dadl-parser/pom.xml
	measure-serv/pom.xml
	mini-termserv/pom.xml
	oet-parser/pom.xml
	openehr-aom/pom.xml
	openehr-ap/pom.xml
	openehr-rm-core/pom.xml
	openehr-rm-domain/pom.xml
	pom.xml
	rm-skeleton/pom.xml
	xml-binding/pom.xml