updated model for manifest generation
Merge remote-tracking branch 'origin/models' into java_class
Generator: fix naming error