Added token authentication for REST api
Merge remote-tracking branch 'origin/master' into master-2