indentation
add social-connect html only if there is a social login enabled
twitter login should work even if the option is disable to be consistent with the behavior of the other social network logins
Merge branch 'fix-user-interface'