ticket:34 supporter roles
Merge branch 'master' into t34_supporter_registration