updated rules, roles and permissions
Merge branch 'dev' of git://github.com/bellcom/os2dagsorden into dev