#9  junit version upgrade.
Merge remote-tracking branch 'origin/master'

Conflicts:
	c24-fixml-api/pom.xml
	c24-fixml-models/pom.xml