misc changes
Merge branch 'master' into feature/authentication
add simple check for token
integrate authentication