Updated social signup to work with updated usp's. Blocked multiple users with same email id from different user type.
fixed constants merge conflicts