bo_secondary Role ident f-me/carma#1471
Merge branch 'master' into vinnie

Conflicts:
	carma-models.cabal
	src/Carma/Model/Role.hs