Straightening out a SVN tree conflict. Adding back in the new JAR files needed to support Google signin