Merge pull request #121 from zenhack/model-cleanup

Cleanup haas.model
Merge branch 'devel' into api-group-ownership-consistency