Merge branch 'social_login' into develop

synapse/res/templates/sso_auth_confirm.html

@@ -20,7 +20,7 @@
             </strong></p>
         </header>
         <main>
-            <a href="{{ redirect_url }}" class="primary-button"/>
+            <a href="{{ redirect_url }}" class="primary-button">
                 Continue with {{ idp.idp_name }}
             </a>
         </main>