Fixed references to GroupRole, Grant and GroupMembership types..
Fixed compilation errors.
Merge pull request #1 from pedroigor/picketlink-relationship

Relationship refactoring to the FileBasedIdentityStore