Permission part changes
Merge branch 'master' of https://github.com/cogn/damp