user relationships and cancan integration
Merge pull request #6 from mplaza/melabranch

user relationships and cancan integration