merge authentification into dolphins branch