Moved role constraints into model and removed edit deployment
Merge pull request #24 from tboerger/feature/constraint-move

Moved role constraints into model and removed edit deployment
Merge pull request #25 from crowbar/release/stoney/master

Sync with stoney (only change is role constraints)