ref #6190 removing svn property place holder in first line of code - java files
merged/implemented cdm3.3 model adaptations
merged trunk into branch
refactoring of package names for consistency
had to rename the packages to make them compliant with buckminster