Rename SOCIAL_GOD to SOCIAL_SUPERADMIN
Change method to get Tenant and Roles
Other Fixes.
Merge remote-tracking branch 'cortiz/master'