New ACL system
Merge branch 'master' into new-acl-system
Merge branch 'master' into new-acl-system
Add note that the migration files are autogenerated
Fix style
Added ToDo to base some model classes on base class or mixins