Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.Message.js
	wcfsetup/install/files/js/WCF.Message.min.js
	wcfsetup/install/files/lib/action/GoogleAuthAction.class.php

diff --cc wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
index 0b73bd0e46abdab439743adc3cd55b23b55b359b,ac8134f5900cf1cf8593f029f099087f1d95bc7d..88e54aedb85e5bf97ae3c0906e1da94d7b197af9
--- 1/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
--- 2/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
@@@ -128,11 -128,8 +128,11 @@@ class GoogleAuthAction extends Abstract
                                        
                                        WCF::getSession()->register('__googleData', $userData);
                                        
-                                       // we assume that bots won't register on facebook first
+                                       // we assume that bots won't register on google first
 -                                      WCF::getSession()->register('recaptchaDone', true);
 +                                      // thus no need for a captcha
 +                                      if (REGISTER_CAPTCHA_TYPE) {
 +                                              WCF::getSession()->register('noRegistrationCaptcha', true);
 +                                      }
                                        
                                        WCF::getSession()->update();
                                        HeaderUtil::redirect(LinkHandler::getInstance()->getLink('Register'));

diff --cc wcfsetup/install/files/lib/system/mail/Mail.class.php
Simple merge