Adding fb authenticator v2, and resolving conflicts from svn to git