merge szzh

Gemfile.lock

@@ -170,8 +170,6 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    mysql2 (0.3.11)
-    mysql2 (0.3.11-x86-mingw32)
     nenv (0.2.0)
     net-ldap (0.3.1)
     nokogiri (1.6.3)
@@ -316,7 +314,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-jdbc-adapter (= 1.2.5)
-  activerecord-jdbcmysql-adapter
   acts-as-taggable-on (= 2.4.1)
   better_errors!
   builder (= 3.0.0)
@@ -337,7 +334,6 @@ DEPENDENCIES
   jquery-rails (~> 2.0.2)
   kaminari
   mocha (~> 1.1.0)
-  mysql2 (= 0.3.11)
   net-ldap (~> 0.3.1)
   nokogiri (~> 1.6.3)
   paperclip (~> 3.5.4)

lib/email_verifier

@@ -1 +1 @@
-Subproject commit 3cabcc643f36939939685e6f55273dfbf89da545
+Subproject commit 222a9bdd72014f197baf2131ab71cc41660111ed