Updated data model generator (added support for default answers)
Merge remote-tracking branch 'origin/development'