fixing all changes except for AssociationClass question (info in review comment)
fixing all changes except for AssociationClass question (info in review comment)

hack4impact/maps4all-jlc-sp2,hack4impact/maps4all-jlc-sp2,hack4impact/maps4all-jlc-sp2,hack4impact/maps4all-jlc-sp2