Merge pull request #99 from michaelnamlee/r2d2

r2d2 - messaging, repo, permissions models
changed group models to LocatableEntity