some more adjustments due to data model change
some more adjustments due to data model change
refactorings
clean up
just project config files (NetBeans Update to 7.3)