replaced \ with @ in function documentation
Merge branch 'master' of https://github.com/MiraGeoscience/entrust
removed trailing spaces
added specification for join table for permission_role in EntrustRole.php
added some error checking in can() for when role is not an object
(\ /)
(O.o)
(> <) Bunny approves these changes.