trix_admin: Force role tag to alway be available.
Merge branch 'master' of github.com:devilry/trix2