New Cleanup

Added hashCode, equals and toString to Role. And deleted stuff generated by past conflict.