token based authentication merged to master