Merge remote-tracking branch 'jira/design' into design
6G data
Merge remote-tracking branch 'jira/design' into design
Merge remote-tracking branch 'coyotte/design' into design
added gen6 and made learnsets ordered alphabetically