Updated the dc compostie xml file
added in the option property in the ds composite model xml
Buildfile and doxyfile
Merge pull request #43 from daniel-dgi/7.x

Buildfile and doxyfile
Sed fix
Merge pull request #44 from daniel-dgi/7.x

Sed fix
Merge pull request #42 from philsogaDGI/7.x

Updated the dc compostie xml file
Merge remote branch 'upstream/7.x' into flvc