authentification and tests for authentification
merge stuff
updates