Added resources migrations0
¡
Fixed user roles inline (issue #244)
Remix with branch bug244_user_no_roles
typo
Merge branch 'master' of git.confine-project.eu:confine/controller into django1.6