Merge pull request #2 from bjornna/master

Fixed failing test org.openehr.adl.flattener.OperationalTemplateBuilderTest#testOntologyMerge
Added support for unique cardinality
Updated license headers
Added license header to antlr file
Some metadata additions to rm model
Added support for value sets