Merge "Google Login - readded javax.servlet-api-3.0.1.jar" into idea133