Fixing cardinalities and adding classifications/descriptions
Authored by: phoubaux 2012-11-22
Parent: [r1583]
Child: [r1585]