Moved role constraints into model and fixed typo
Merge pull request #91 from tboerger/feature/constraint-move

Moved role constraints into model and fixed typo