- reorder attributes in Generation.jadd to match mustache files and types - fixed yaml generation (tested locally only)