Domain model: Configuration/s
Merge branch 'master' into thomas