Level 7 created and XTCDrugComponent fixed
Merge branch 'master'