conflict fixed
Merge pull request #70 from mxvoloshin/master

RequestLogServiceTests and Token check
code removal
test fixed
Merge pull request #4 from argeset/master

update