DEVSUPPHNE-3: many-to-one and dot-convention
Merge pull request #1 from jandm/master

DEVSUPPHNE-3: many-to-one and dot-convention