merge authentification into dolphins fork