fixing automatic creation of capability types
Merge branch 'security' into rails32