subdomain fixes
Merge branch 'social_ui' into pu3